Question

Is it possible to view “svn diff” output graphically on Mac OS?

Most of the graphical diff programs allow you to view only one file per time. Which is very inconvenient when you use svn and have changed like 10 files.

For Linux I have found a solution in “kompare” program.
I do:

svn diff > diffOut; kompare diffOut

and as result I work with graphical program and check all files at once like it shown on the picture.

Is there same thing for Mac OS?

P.S. “meld” programm seems to do the same (or it doesn’t?), and I have already tried to install it, but got an error. Therefore I supouse that I can’t install it under OSx 10.7.

Answer 1

1. There is kompare for Mac OS.
   It is a part of KDE SDK and one can get it using MacPorts:

   sudo port install kdesdk4
   launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist
   export PATH="/Applications/MacPorts/KDE4/kompare.app/Contents/MacOS:"$PATH
   

   and it works!

2. Svn supports so called external diff.

To use it one should create svn-wrapper script, which will take parameters returned by “svn diff” command and call differ with required parameters.

here is an example of parameters “svn diff” returns:

-u -L code/Class1.h (revision 16518) -L code/Class1.h (working copy) code/.svn/text-base/Class1.h.svn-base code/Class1.h

opendiff needs last two. Therefore next bash script will be appropriate:

#!/bin/sh

if [ $# -lt 2 ]; then
    echo "usage: $0 [ignored args...] file1 file2" >&2
    exit 1
fi

# The last two arguments passed to this script are the paths to the files
# to diff.
while [ $# -gt 2 ]; do
    shift
done

exec opendiff $*

put this script in svnwrapper.sh file. Made file executable:

chmod +x svnwrapper.sh

and put it in some common path, which is added to $PATH variable.
Now you can call svn using

svn diff --diff-cmd=svnwrapper.sh

or just add at the section [helpers] in ~/.subversion/config file:

diff-cmd = svnwrapper.sh