templates/filediff.tmpl
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 3363 ce8f31e0b3b8
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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">
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
     7
<a href="#url#log/#rev#{sessionvars%urlparameter}">changelog</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
     8
<a href="#url#shortlog/#rev#{sessionvars%urlparameter}">shortlog</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
     9
<a href="#url#tags{sessionvars%urlparameter}">tags</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    10
<a href="#url#rev/#node|short#{sessionvars%urlparameter}">changeset</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    11
<a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">file</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    12
<a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a>
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    13
<a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">annotate</a>
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3206
diff changeset
    14
<a href="#url#raw-diff/#node|short#/#file|urlescape#">raw</a>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    15
</div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    16
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
    17
<h2>#file|escape#</h2>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    18
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
    19
<table id="filediffEntry">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    20
<tr>
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
    21
 <th class="revision">revision #rev#:</th>
3363
ce8f31e0b3b8 hgweb: Apply the new method of passing session variables to links.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3272
diff changeset
    22
 <td class="revision"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td>
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
    23
</tr>
1416
19d2776f1725 hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1410
diff changeset
    24
#parent%filediffparent#
1606
ba625c8083d8 - duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents: 1416
diff changeset
    25
#child%filediffchild#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    26
</table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    27
672
dbe0ce2ae196 More IE friendly diff output related templates.
Edouard Gomez <ed.gomez@free.fr>
parents: 602
diff changeset
    28
<div id="fileDiff">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    29
#diff#
602
56d81b303656 Various HTML cleanups
mpm@selenic.com
parents: 571
diff changeset
    30
</div>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    31
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    32
#footer#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    33
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    34