annotate templates/filediff.tmpl @ 2019:ced2d3620f95

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents f2ebd5251e88
children 46b19175fec6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
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
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
3 </head>
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
4 <body>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
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
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
14 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
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
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
17
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
18 <table id="filediffEntry">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
19 <tr>
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
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
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
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
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
25 </table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
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
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
28 #diff#
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
29 </div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
30
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
31 #footer#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
32
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
33