Mercurial > hg > mercurial-crew-with-dirclash

view templates/filediff.tmpl @ 2901:05f357b70cb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tune a bit the extdiff toplevel comments/samples. * Capitalize the first letter of all sentences * Add an example for GNU diff(1) 'context diff' mode. * Explain the requirement for separate cmd.xxx and opts.xxx options in .hgrc, which hopefully will guard against users trying to add: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff -Nprc5 which fails for recent crew builds with: $ hg cdiff . making snapshot of 1 files from rev 07dc4a569f4e making snapshot of 1 files from working dir diff -Nprc5: not found The correct way to do this is by separating the cmd.cdiff and opts.cdiff parts like this: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff opts.cdiff = -Nprc5 so add it as a new example and explicitly describe it in the extdiff comments.
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Tue, 15 Aug 2006 18:14:58 +0300
parents 46b19175fec6
children 79fd7a92f3e2
line wrap: on
line source

#header#
<title>#repo|escape#: #file|escape# diff</title>
</head>
<body>

<div class="buttons">
<a href="?cl=#rev#">changelog</a>
<a href="?sl=#rev#">shortlog</a>
<a href="?tags=">tags</a>
<a href="?cs=#node|short#">changeset</a>
<a href="?f=#filenode|short#;file=#file|urlescape#">file</a>
<a href="?fl=#filenode|short#;file=#file|urlescape#">revisions</a>
<a href="?fa=#filenode|short#;file=#file|urlescape#">annotate</a>
<a href="?fd=#node|short#;file=#file|urlescape#;style=raw">raw</a>
</div>

<h2>#file|escape#</h2>

<table id="filediffEntry">
<tr>
 <th class="revision">revision #rev#:</th>
 <td class="revision"><a href="?cs=#node|short#">#node|short#</a></td>
</tr>
#parent%filediffparent#
#child%filediffchild#
</table>

<div id="fileDiff">
#diff#
</div>

#footer#