5 May 2011

subversion and xxdiff

xxdiff is an X11 application for displaying differences of two files.

Installation on Debian:
$ sudo apt-get install xxdiff-scripts

Example usage with subversion (if you run the above command and are on X11 with xxdiff installed and in your $PATH, xxdiff should start, else console output should appear):

#!/usr/bin/env bash
# $Id: svndiff_gui.sh 174 2011-05-05 19:13:55Z wus $

# use xxdiff when available and on X11

if [[ -n "$DISPLAY" && -x `which xxdiff` ]]; then
 svn stat
 read -p "Graphical diff? [Y/n]: " proceed
 if [[ "$proceed" == "" || "$proceed" == "y" || "$proceed" == "Y" ]]; then
  xx-svn-diff $@
  exit $?
 fi
fi

svn diff $@