Mercurial > hg
annotate mercurial/templates/paper/map @ 17202:1ae119269ddc
hgweb: side-by-side comparison functionality
Adds new web command to the core, ``comparison``, which enables colorful
side-by-side change display, which for some might be much easier to work with
than the standard line diff output. The idea how to implement comes from the
SonicHq extension.
The web interface gets a new link to call the comparison functionality. It lets
users configure the amount of context lines around change blocks, or to show
full files - check help (also in this changeset) for details and defaults. The
setting in hgrc can be overridden by adding ``context=<value>`` to the request
query string. The comparison creates addressable lines, so as to enable sharing
links to specific lines, just as standard diff does.
Incorporates updates to all web related styles.
Known limitations:
* the column diff is done against the first parent, just as the standard diff
* this change allows examining diffs for single files only (as I am not sure if
examining the whole changeset in this way would be helpful)
* syntax highlighting of the output changes is not performed (enabling the
highlight extension has no influence on it)
author | wujek srujek |
---|---|
date | Sun, 08 Jul 2012 17:17:02 +0200 |
parents | f208a4e20018 |
children | 5c64ce6168da |
rev | line source |
---|---|
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 default = 'shortlog' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 mimetype = 'text/html; charset={encoding}' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 header = header.tmpl |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
5 footer = footer.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
6 search = search.tmpl |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
8 changelog = shortlog.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
9 shortlog = shortlog.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
10 shortlogentry = shortlogentry.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
11 graph = graph.tmpl |
12666
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
10575
diff
changeset
|
12 help = help.tmpl |
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
10575
diff
changeset
|
13 helptopics = helptopics.tmpl |
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
10575
diff
changeset
|
14 |
ead4e21f49f1
web: add a help view for getting hg help output
Augie Fackler <durin42@gmail.com>
parents:
10575
diff
changeset
|
15 helpentry = '<tr><td><a href="{url}help/{topic|escape}{sessionvars%urlparameter}">{topic|escape}</a></td><td>{summary|escape}</td></tr>' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
6701
bf72e756c98b
templates: fix navigation links for graph entries
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6692
diff
changeset
|
19 navgraphentry = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}">{label|escape}</a> ' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> ' |
7182
295af5bc1bcc
hgweb: remove links to non-existent file versions
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6905
diff
changeset
|
23 filenolink = '{file|escape} ' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 fileellipses = '...' |
14563
81fc9678b018
paper, coal: define the diffstat templates
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
25 diffstatlink = diffstat.tmpl |
81fc9678b018
paper, coal: define the diffstat templates
Steven Brown <StevenGBrown@gmail.com>
parents:
14046
diff
changeset
|
26 diffstatnolink = diffstat.tmpl |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
27 changelogentry = shortlogentry.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
28 searchentry = shortlogentry.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
29 changeset = changeset.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
30 manifest = manifest.tmpl |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
31 |
10254
8d5de52431f2
hgweb: changenav: separate pages before and after the current position
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9999
diff
changeset
|
32 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
|
33 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
|
34 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
|
35 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
|
36 |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
37 direntry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
38 <tr class="fileline parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
39 <td class="name"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
40 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
41 <img src="{staticurl}coal-folder.png" alt="dir."/> {basename|escape}/ |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
42 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
43 <a href="{url}file/{node|short}{path|urlescape}/{emptydirs|urlescape}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
44 {emptydirs|escape} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
45 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
46 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
47 <td class="size"></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
48 <td class="permissions">drwxr-xr-x</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
49 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
50 |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
51 fileentry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
52 <tr class="fileline parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
53 <td class="filename"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
54 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
55 <img src="{staticurl}coal-file.png" alt="file"/> {basename|escape} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
56 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
57 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
58 <td class="size">{size}</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
59 <td class="permissions">{permissions|permissions}</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
60 </tr>' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
62 filerevision = filerevision.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
63 fileannotate = fileannotate.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
64 filediff = filediff.tmpl |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
65 filecomparison = filecomparison.tmpl |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
66 filelog = filelog.tmpl |
8486
835b1ee111f4
coal, paper: add newlines when displaying a file in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
8372
diff
changeset
|
67 fileline = ' |
835b1ee111f4
coal, paper: add newlines when displaying a file in hgweb
Martin Geisler <mg@lazybytes.net>
parents:
8372
diff
changeset
|
68 <div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
69 filelogentry = filelogentry.tmpl |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
70 |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
71 annotateline = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
72 <tr class="parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
73 <td class="annotate"> |
16577
f208a4e20018
paper, monoblue: link correctly to lines in annotate view
Martin Geisler <mg@aragost.com>
parents:
15375
diff
changeset
|
74 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
75 title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
76 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
77 <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
78 </tr>' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
79 |
8369
93a811ef3ac0
coal/paper: Wrap diff in <pre/>
Rocco Rutte <pdmef@gmx.net>
parents:
8353
diff
changeset
|
80 diffblock = '<div class="source bottomline parity{parity}"><pre>{lines}</pre></div>' |
7394
03b60f2f90bf
hgweb (coal/paper): make file, diff and annotate easier to render
Brendan Cully <brendan@kublai.com>
parents:
7305
diff
changeset
|
81 difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>' |
03b60f2f90bf
hgweb (coal/paper): make file, diff and annotate easier to render
Brendan Cully <brendan@kublai.com>
parents:
7305
diff
changeset
|
82 difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>' |
03b60f2f90bf
hgweb (coal/paper): make file, diff and annotate easier to render
Brendan Cully <brendan@kublai.com>
parents:
7305
diff
changeset
|
83 difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>' |
03b60f2f90bf
hgweb (coal/paper): make file, diff and annotate easier to render
Brendan Cully <brendan@kublai.com>
parents:
7305
diff
changeset
|
84 diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
85 |
17202
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
86 comparison = ' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
87 <table class="bigtable"> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
88 <thead class="header"> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
89 <tr> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
90 <th>{leftrev}:{leftnode|short}</th> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
91 <th>{rightrev}:{rightnode|short}</th> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
92 </tr> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
93 </thead> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
94 {blocks} |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
95 </table>' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
96 comparisonblock =' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
97 <tbody class="block"> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
98 {lines} |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
99 </tbody>' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
100 comparisonline = ' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
101 <tr> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
102 <td class="source {type}"><a href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</td> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
103 <td class="source {type}"><a href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</td> |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
104 </tr>' |
1ae119269ddc
hgweb: side-by-side comparison functionality
wujek srujek
parents:
16577
diff
changeset
|
105 |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
106 changelogparent = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
107 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
108 <th class="parent">parent {rev}:</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
109 <td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
110 </tr>' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
111 |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
112 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
113 |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
114 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
115 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
116 |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
117 filerename = '{file|escape}@' |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
118 filelogrename = ' |
13850
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
119 <span class="base"> |
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
120 base |
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
121 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
122 {file|escape}@{node|short} |
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
123 </a> |
1209e1d52b68
hgweb: add base link to file log for paper and coal styles (issue2452)
Kevin Gessner <kevin@fogcreek.com>
parents:
13597
diff
changeset
|
124 </span>' |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
125 fileannotateparent = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
126 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
127 <td class="metatag">parent:</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
128 <td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
129 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
130 {rename%filerename}{node|short} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
131 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
132 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
133 </tr>' |
7668
876de22b70b8
coal/paper: add missing spaces in changeset child formatting
Stepan Koltsov <yozh@mx1.ru>
parents:
7411
diff
changeset
|
134 changesetchild = ' <a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>' |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
135 changelogchild = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
136 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
137 <th class="child">child</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
138 <td class="child"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
139 <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
140 {node|short} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
141 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
142 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
143 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
144 fileannotatechild = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
145 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
146 <td class="metatag">child:</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
147 <td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
148 <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
149 {node|short} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
150 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
151 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
152 </tr>' |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
153 tags = tags.tmpl |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
154 tagentry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
155 <tr class="tagEntry parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
156 <td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
157 <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
158 {tag|escape} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
159 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
160 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
161 <td class="node"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
162 {node|short} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
163 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
164 </tr>' |
13597
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
165 bookmarks = bookmarks.tmpl |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
166 bookmarkentry = ' |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
167 <tr class="tagEntry parity{parity}"> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
168 <td> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
169 <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
170 {bookmark|escape} |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
171 </a> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
172 </td> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
173 <td class="node"> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
174 {node|short} |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
175 </td> |
38c9837b1f75
hgweb: add separate page with bookmarks listing
Alexander Solovyov <alexander@solovyov.net>
parents:
13596
diff
changeset
|
176 </tr>' |
8353
6058d291abdf
paper/coal: add branches page
Sune Foldager <cryo@cyanite.org>
parents:
8240
diff
changeset
|
177 branches = branches.tmpl |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
178 branchentry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
179 <tr class="tagEntry parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
180 <td> |
8713
de6bb29e208a
hgweb: allow distinction between open/closed branches on branches page
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8486
diff
changeset
|
181 <a href="{url}shortlog/{node|short}{sessionvars%urlparameter}" class="{status}"> |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
182 {branch|escape} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
183 </a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
184 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
185 <td class="node"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
186 {node|short} |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
187 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
188 </tr>' |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
189 changelogtag = '<span class="tag">{name|escape}</span> ' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
190 changesettag = '<span class="tag">{tag|escape}</span> ' |
13596
270f57d35525
hgweb: add display of bookmarks for changelog and changeset
Alexander Solovyov <alexander@solovyov.net>
parents:
12666
diff
changeset
|
191 changesetbookmark = '<span class="tag">{bookmark|escape}</span> ' |
7407
7b2a77b20964
coal/paper: display branch names in log
Benoit Allard <benoit@aeteurope.nl>
parents:
7394
diff
changeset
|
192 changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' |
10575
136eed1ac69c
trailing spaces (and one stray tab)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
10254
diff
changeset
|
193 changelogbranchname = '<span class="branchname">{name|escape}</span> ' |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
194 |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
195 filediffparent = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
196 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
197 <th class="parent">parent {rev}:</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
198 <td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
199 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
200 filelogparent = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
201 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
202 <th>parent {rev}:</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
203 <td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
204 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
205 filediffchild = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
206 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
207 <th class="child">child {rev}:</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
208 <td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
209 </td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
210 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
211 filelogchild = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
212 <tr> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
213 <th>child {rev}:</th> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
214 <td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
215 </tr>' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
216 |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
217 indexentry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
218 <tr class="parity{parity}"> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
219 <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
220 <td>{description}</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
221 <td>{contact|obfuscate}</td> |
15375
fe9d36a6853e
hgweb: fix dynamic date calculation not working under Safari
Brodie Rao <brodie@bitheap.org>
parents:
14563
diff
changeset
|
222 <td class="age">{lastchange|rfc822date}</td> |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
223 <td class="indexlinks">{archives%indexarchiveentry}</td> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
224 </tr>\n' |
6734
41edbc2e0b0b
Improve archive links in coal/paper index
Brendan Cully <brendan@kublai.com>
parents:
6701
diff
changeset
|
225 indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>' |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
226 index = index.tmpl |
8372
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
227 archiveentry = ' |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
228 <li> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
229 <a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> |
783c8c78db86
paper: break long lines in map file
Martin Geisler <mg@lazybytes.net>
parents:
8369
diff
changeset
|
230 </li>' |
7411
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
231 notfound = notfound.tmpl |
b71ee3e00e81
coal/paper: move actual templates from coal to paper
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7407
diff
changeset
|
232 error = error.tmpl |
6661
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
233 urlparameter = '{separator}{name}={value|urlescape}' |
d1a312daa574
hgweb: add paper style derived from coal
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
234 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />' |