t / lib-git-svn.shon commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   1. ./test-lib.sh
   2
   3if test -n "$NO_SVN_TESTS"
   4then
   5        test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' :
   6        test_done
   7        exit
   8fi
   9
  10GIT_DIR=$PWD/.git
  11GIT_SVN_DIR=$GIT_DIR/svn/git-svn
  12SVN_TREE=$GIT_SVN_DIR/svn-tree
  13
  14svn >/dev/null 2>&1
  15if test $? -ne 1
  16then
  17    test_expect_success 'skipping git-svn tests, svn not found' :
  18    test_done
  19    exit
  20fi
  21
  22svnrepo=$PWD/svnrepo
  23export svnrepo
  24
  25perl -w -e "
  26use SVN::Core;
  27use SVN::Repos;
  28\$SVN::Core::VERSION gt '1.1.0' or exit(42);
  29system(qw/svnadmin create --fs-type fsfs/, \$ENV{svnrepo}) == 0 or exit(41);
  30" >&3 2>&4
  31x=$?
  32if test $x -ne 0
  33then
  34        if test $x -eq 42; then
  35                err='Perl SVN libraries must be >= 1.1.0'
  36        elif test $x -eq 41; then
  37                err='svnadmin failed to create fsfs repository'
  38        else
  39                err='Perl SVN libraries not found or unusable, skipping test'
  40        fi
  41        test_expect_success "$err" :
  42        test_done
  43        exit
  44fi
  45
  46rawsvnrepo="$svnrepo"
  47svnrepo="file://$svnrepo"
  48
  49poke() {
  50        test-chmtime +1 "$1"
  51}
  52
  53for d in \
  54        "$SVN_HTTPD_PATH" \
  55        /usr/sbin/apache2 \
  56        /usr/sbin/httpd \
  57; do
  58        if test -f "$d"
  59        then
  60                SVN_HTTPD_PATH="$d"
  61                break
  62        fi
  63done
  64for d in \
  65        "$SVN_HTTPD_MODULE_PATH" \
  66        /usr/lib/apache2/modules \
  67        /usr/libexec/apache2 \
  68; do
  69        if test -d "$d"
  70        then
  71                SVN_HTTPD_MODULE_PATH="$d"
  72                break
  73        fi
  74done
  75
  76start_httpd () {
  77        repo_base_path="$1"
  78        if test -z "$SVN_HTTPD_PORT"
  79        then
  80                echo >&2 'SVN_HTTPD_PORT is not defined!'
  81                return
  82        fi
  83        if test -z "$repo_base_path"
  84        then
  85                repo_base_path=svn
  86        fi
  87
  88        mkdir "$GIT_DIR"/logs
  89
  90        cat > "$GIT_DIR/httpd.conf" <<EOF
  91ServerName "git-svn test"
  92ServerRoot "$GIT_DIR"
  93DocumentRoot "$GIT_DIR"
  94PidFile "$GIT_DIR/httpd.pid"
  95LockFile logs/accept.lock
  96Listen 127.0.0.1:$SVN_HTTPD_PORT
  97LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
  98LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
  99<Location /$repo_base_path>
 100        DAV svn
 101        SVNPath "$rawsvnrepo"
 102</Location>
 103EOF
 104        "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
 105        svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"
 106}
 107
 108stop_httpd () {
 109        test -z "$SVN_HTTPD_PORT" && return
 110        "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k stop
 111}
 112
 113convert_to_rev_db () {
 114        perl -w -- - "$@" <<\EOF
 115use strict;
 116@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>";
 117open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";
 118open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]";
 119my $size = (stat($rd))[7];
 120($size % 24) == 0 or die "Inconsistent size: $size";
 121while (sysread($rd, my $buf, 24) == 24) {
 122        my ($r, $c) = unpack('NH40', $buf);
 123        my $offset = $r * 41;
 124        seek $wr, 0, 2 or die $!;
 125        my $pos = tell $wr;
 126        if ($pos < $offset) {
 127                for (1 .. (($offset - $pos) / 41)) {
 128                        print $wr (('0' x 40),"\n") or die $!;
 129                }
 130        }
 131        seek $wr, $offset, 0 or die $!;
 132        print $wr $c,"\n" or die $!;
 133}
 134close $wr or die $!;
 135close $rd or die $!;
 136EOF
 137}