adiff - wordwise diff

This tool is a replacement for GNU wdiff that provides the ability to generate context and unified diffs based on the wordwise diff. It's written in Perl instead of C, so it's both shorter and slower. It doesn't have as many options as wdiff, but it provides some others.

You can find the man-page here or you can generate it from the embedded pod in adiff.

Downloads

adiff with subversion

The main reason I wrote adiff was so I could get meaningful diff mails from subversion when Word documents are checked in. To make this happen, I tie together run-mailcap, antiword and adiff. Since it uses run-mailcap, the system should work for arbitrary binary files.

Regarding the files posted below:

• The mailcap is suitable to be installed as the system /etc/mailcap. It relies on the external script "dumptext" which you can install in /usr/local/bin.
• run-mailcap in most distributions (except Gentoo) can get into an infinite loop. The provided patch fixes the problem.
• Finally you'll need an updated commit-email.pl and post-commit hook. For the former, you can use mine directly, just install it in /usr/local/bin. For the latter, you'll need to create one specifically for your site from the supplied /var/svn/hooks/post-commit.tmpl. I've included mine here for reference only.

Downloads