Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates/filelogentry.tmpl
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 10 Aug 2005 06:47:46 +0100
changeset 862 d70c1c31fd45
parent 377 e5d769afd3ef
child 1410 17703aa4491e
permissions -rw-r--r--
Fix 3-way-merge of original parent, workdir and new parent. The dirstate has to match what is in the repository (what would be checked out with 'hg update -C'), because the resulting file may be identical to the new parent, or it may be completely different. Previously the dirstate wasn't updated, so if you changed the file to look like the original parent, it might be considered unmodified relative to the new parent.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset 
     1
 
<table class="parity#parity#" width="100%" cellspacing="0" cellpadding="0">
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     2
 
<tr>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 167
diff changeset 
     3
 
 <td align="right" width="15%"><b>#date|age# ago:&nbsp;</b></td>
233
33c48b635690 Add missing > to </td> in templates.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 201
diff changeset 
     4
 
 <td><b><a href="?cmd=changeset;node=#node#">#desc|firstline|escape#</a></b></td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     5
 
<tr>
167
fad9ad1ec7c7 Hide most revision numbers in hgweb
mpm@selenic.com
parents: 155
diff changeset 
     6
 
 <td align="right">revision #filerev#:&nbsp;</td>
375
b29219389b00 Show nice short hashes in hgweb
mpm@selenic.com
parents: 241
diff changeset 
     7
 
 <td><a href="?cmd=file;file=#file#;filenode=#filenode#">#filenode|short#</a>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     8
 
<a href="?cmd=filediff;file=#file#;node=#node#">(diff)</a>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
     9
 
<a href="?cmd=annotate;file=#file#;filenode=#filenode#">(annotate)</a>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    10
 
</td></tr>
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    11
 
<tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset 
    12
 
 <td align="right">author:&nbsp;</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 167
diff changeset 
    13
 
 <td>#author|obfuscate#</td></tr>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    14
 
<tr>
154
1d5f799ebe1e fixed problem with head/body tags, added dtd, fixed table attributes
jake@edge2.net
parents: 142
diff changeset 
    15
 
 <td align="right">date:&nbsp;</td>
201
f918a6fa2572 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com
parents: 167
diff changeset 
    16
 
 <td>#date|date# (#date|age# ago)</td></tr>
142
529bf610092e Prettify the web interface
mpm@selenic.com
parents: 138
diff changeset 
    17
 
</table>
138
c77a679e9cfa Revamped templated hgweb
mpm@selenic.com
parents:
diff changeset 
    18
 












c77a679e9cfa
Revamped templated hgweb



mpm@selenic.com


parents: 

diff
changeset




    19
















mercurial-crew-with-dirclash