templates/fileannotate.tmpl
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 3393 22a106cb5650
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
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# annotate</title>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
     3
</head>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
     4
<body>
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##path|urlescape#{sessionvars%urlparameter}">manifest</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#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
    13
<a href="#url#log/#node|short#/#file|urlescape#{sessionvars%urlparameter}">revisions</a>
3264
d1aa83f199ef Update templates to use NewWebInterface
Brendan Cully <brendan@kublai.com>
parents: 3206
diff changeset
    14
<a href="#url#raw-annotate/#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>Annotate #file|escape#</h2>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    18
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    19
<table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    20
<tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset
    21
 <td class="metatag">changeset #rev#:</td>
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><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
1416
19d2776f1725 hgweb: hide trivial parent (like in show_changeset)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1410
diff changeset
    23
#parent%fileannotateparent#
1606
ba625c8083d8 - duplicate the parent link logic to show child links
Muli Ben-Yehuda <mulix@mulix.org>
parents: 1416
diff changeset
    24
#child%fileannotatechild#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    25
<tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
    26
 <td class="metatag">author:</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 168
diff changeset
    27
 <td>#author|obfuscate#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    28
<tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
    29
 <td class="metatag">date:</td>
236
85f0420fd848 Removed extra closing brace from date string.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 201
diff changeset
    30
 <td>#date|date# (#date|age# ago)</td></tr>
359
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset
    31
<tr>
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset
    32
 <td class="metatag">permissions:</td>
0c4688e9ee5c hgweb: add file permissions
mpm@selenic.com
parents: 241
diff changeset
    33
 <td>#permissions|permissions#</td></tr>
3391
defadc26e674 hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents: 3363
diff changeset
    34
<tr>
defadc26e674 hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents: 3363
diff changeset
    35
  <td class="metatag">description:</td>
defadc26e674 hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents: 3363
diff changeset
    36
  <td>{desc|strip|escape|addbreaks}</td>
defadc26e674 hgweb: add changeset description to annotate page
Brendan Cully <brendan@kublai.com>
parents: 3363
diff changeset
    37
</tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    38
</table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    39
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    40
<br/>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    41
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 153
diff changeset
    42
<table cellspacing="0" cellpadding="0">
977
289975641886 hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents: 570
diff changeset
    43
#annotate%annotateline#
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    44
</table>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset
    45
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset
    46
#footer#