Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/filediff.tmpl @ 1700:e2f91e0acbb8
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
author | Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
---|---|
date | Mon, 06 Feb 2006 17:32:06 -0600 |
parents | f2ebd5251e88 |
children | 46b19175fec6 |
rev | line source |
---|---|
142 | 1 #header# |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
2 <title>#repo|escape#: #file|escape# diff</title> |
142 | 3 </head> |
4 <body> | |
138 | 5 |
154
1d5f799ebe1e
fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents:
153
diff
changeset
|
6 <div class="buttons"> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
7 <a href="?cl=#rev#">changelog</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
8 <a href="?tags=">tags</a> |
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
9 <a href="?cs=#node|short#">changeset</a> |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
10 <a href="?f=#filenode|short#;file=#file|urlescape#">file</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
11 <a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
12 <a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a> |
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
13 <a href="?fd=#node|short#;file=#file|urlescape#;style=raw">raw</a> |
142 | 14 </div> |
138 | 15 |
1650
f2ebd5251e88
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Peter van Dijk <peter@dataloss.nl>
parents:
1606
diff
changeset
|
16 <h2>#file|escape#</h2> |
138 | 17 |
602 | 18 <table id="filediffEntry"> |
138 | 19 <tr> |
602 | 20 <th class="revision">revision #rev#:</th> |
1410
17703aa4491e
hgweb: shorten all the URLs in the standard templates
Matt Mackall <mpm@selenic.com>
parents:
672
diff
changeset
|
21 <td class="revision"><a href="?cs=#node|short#">#node|short#</a></td> |
602 | 22 </tr> |
1416
19d2776f1725
hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1410
diff
changeset
|
23 #parent%filediffparent# |
1606
ba625c8083d8
- duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents:
1416
diff
changeset
|
24 #child%filediffchild# |
138 | 25 </table> |
26 | |
672
dbe0ce2ae196
More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents:
602
diff
changeset
|
27 <div id="fileDiff"> |
138 | 28 #diff# |
602 | 29 </div> |
138 | 30 |
142 | 31 #footer# |
138 | 32 |
33 |