**Colored Diffs:** (from Daniel Lundin <{link: mailto:daniel@codefactory.se daniel@codefactory.se}>)
Since CVSTrac now has support for using an external 'diff' program (see checkin [229]), I wrote a small filter program to accomplish this, similar to the output of cvsview.
The output is marked up using CSS styles, so customizing the appearance should be simple enough for anyone who cares enough.
**Example output**
A sample output is viewable at http://afs.codefactory.se/user/daniel/diff2html/sample.html
**Where to get it**
The program is available at:
*: http://afs.codefactory.se/user/daniel/diff2html/
*: or if you use the AFS distributed file system: {link: file:///afs/codefactory.se/user/daniel/diff2html/ /afs/codefactory.se/user/daniel/diff2html/}
----
**Setting up colored diffs**
In the setup section of CVSTrac, under 'Diff Programs', add something like:
rcsdiff -q -r%V1 -r%V2 -u '%F' | diff2html
That should work right away.
**Using the included stylesheet**
Also under setup, under 'Heders & Footers', make sure to link to the stylesheet as any regular CSS stylesheet.
A sample (probably overly simplified) header:
----
Caveat: gawk 3.0.4 chokes on diff2html with the following error message: gawk: diff2html:93: fatal: match() cannot have 3 arguments
{link: http://mac.against.org Rui Carmo}: I also came across this problem, so I rigged up this short awk script that does everything I need (just pipe the rcsdiff output through it and define matching CSS classes on the page header):
#! /usr/bin/gawk -f
function html_escape( text ) {
gsub(//, "\\>", text);
gsub(/\t/, " ", text);
gsub(/ /, "\\ ", text);
return text;
}
BEGIN { print "
" }
END { print "
" }
/^-/ { print "" html_escape( $0 ) ""; next; }
/^+/ { print "" html_escape( $0 ) ""; next; }
/^@/ { print "" html_escape( $0 ) ""; next; }
{ print html_escape( $0 ) }
----
{link: http://www.unrarlib.org CS}: Try a newer version of gwak (i.e. 3.1.1).
Download it from this site:
http://ftp.gnu.org/gnu/gawk/
Read
{link: http://groups.google.ch/groups?hl=de&lr=&ie=UTF-8&frame=right&th=9ae067a318778390&seekm=3D087078.F19DFACB%40lml.ls.fi.upm.es#link20 this } for more details.
----
RuiCarmo: Installing a new version of (g)awk is not an option on the box I'm running this - besides, simpler alternatives are easier to build upon...
----
DanielArena: I found a small bug in the diff2html script: lines replaced by blank lines will not show up in the diff. I corrected this by doing the following:
Replace these lines:
state = substr ($0, 0, 1);
text = substr ($0, 2);
With these lines:
state = substr ($0 " ", 0, 1);
text = substr ($0 " ", 2);
I don't really do much scripting, so use these at your own risk. Looks like it works, though.