From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jan 2011 00:22:00 +0000 (-0800)
Subject: Merge branch 'jn/svn-fe' (early part) into next
X-Git-Tag: ko-next~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=58a8b567e3a1af0c85a02b0878af388cae0ced4c;p=git.git

Merge branch 'jn/svn-fe' (early part) into next

* 'jn/svn-fe' (early part):
  vcs-svn: Error out for v3 dumps

Conflicts:
	t/t9010-svn-fe.sh
---

58a8b567e3a1af0c85a02b0878af388cae0ced4c
diff --cc t/t9010-svn-fe.sh
index faf909296,e9e46ea0f..c96bf2f5c
--- a/t/t9010-svn-fe.sh
+++ b/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