Merge branch 'jn/svn-fe' (early part)
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 21:34:43 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jan 2011 21:34:43 +0000 (13:34 -0800)
* 'jn/svn-fe' (early part):
  vcs-svn: Error out for v3 dumps

Conflicts:
t/t9010-svn-fe.sh

1  2 
t/t9010-svn-fe.sh

@@@ -2,47 -2,46 +2,62 @@@
  
  test_description='check svn dumpfile importer'
  
 -. ./lib-git-svn.sh
 +. ./test-lib.sh
 +
 +if ! svnadmin -h >/dev/null 2>&1
 +then
 +      skip_all='skipping svn-fe tests, svn not available'
 +      test_done
 +fi
 +
 +svnconf=$PWD/svnconf
 +export svnconf
 +
 +svn_cmd () {
 +      subcommand=$1 &&
 +      shift &&
 +      mkdir -p "$svnconf" &&
 +      svn "$subcommand" --config-dir "$svnconf" "$@"
 +}
  
- test_dump () {
-       label=$1
-       dump=$2
-       test_expect_success "$dump" '
-               svnadmin create "$label-svn" &&
-               svnadmin load "$label-svn" < "$TEST_DIRECTORY/$dump" &&
-               svn_cmd export "file://$PWD/$label-svn" "$label-svnco" &&
-               git init "$label-git" &&
-               test-svn-fe "$TEST_DIRECTORY/$dump" >"$label.fe" &&
-               (
-                       cd "$label-git" &&
-                       git fast-import < ../"$label.fe"
-               ) &&
-               (
-                       cd "$label-svnco" &&
-                       git init &&
-                       git add . &&
-                       git fetch "../$label-git" master &&
-                       git diff --exit-code FETCH_HEAD
-               )
-       '
+ reinit_git () {
+       rm -fr .git &&
+       git init
  }
  
- test_dump simple t9135/svn.dump
+ >empty
+ test_expect_success 'empty dump' '
+       reinit_git &&
+       echo "SVN-fs-dump-format-version: 2" >input &&
+       test-svn-fe input >stream &&
+       git fast-import <stream
+ '
+ test_expect_success 'v3 dumps not supported' '
+       reinit_git &&
+       echo "SVN-fs-dump-format-version: 3" >input &&
+       test_must_fail test-svn-fe input >stream &&
+       test_cmp empty stream
+ '
+ test_expect_success 't9135/svn.dump' '
+       svnadmin create simple-svn &&
+       svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
+       svn_cmd export "file://$PWD/simple-svn" simple-svnco &&
+       git init simple-git &&
+       test-svn-fe "$TEST_DIRECTORY/t9135/svn.dump" >simple.fe &&
+       (
+               cd simple-git &&
+               git fast-import <../simple.fe
+       ) &&
+       (
+               cd simple-svnco &&
+               git init &&
+               git add . &&
+               git fetch ../simple-git master &&
+               git diff --exit-code FETCH_HEAD
+       )
+ '
  
  test_done