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/filediff.tmpl
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 3363 ce8f31e0b3b8
permissions -rw-r--r--
Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
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
















mercurial-crew-with-dirclash