X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9107-git-svn-migrate.sh;h=d549665400a2eccffec0689865a1e9fdcc034985;hb=e58db03bbee4af96e60b6ac88b84c1c11b8b037e;hp=74a45ec6478012eb9172bc7700fc1abd997a8ac2;hpb=47e39c55c91993b94824b7a317ebeb965aaeb45a;p=git.git

diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 74a45ec64..d54966540 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -5,14 +5,19 @@ test_description='git-svn metadata migrations from previous versions'
 
 test_expect_success 'setup old-looking metadata' "
 	cp $GIT_DIR/config $GIT_DIR/config-old-git-svn &&
+	mkdir import &&
+	cd import &&
+		for i in trunk branches/a branches/b \
+		         tags/0.1 tags/0.2 tags/0.3; do
+			mkdir -p \$i && \
+			echo hello >> \$i/README || exit 1
+		done && \
+		svn import -m test . $svnrepo
+		cd .. &&
 	git-svn init $svnrepo &&
 	git-svn fetch &&
-	for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3; do
-		mkdir -p \$i && echo hello >> \$i/README || exit 1; done &&
-	git ls-files -o trunk branches tags | git update-index --add --stdin &&
-	git commit -m 'test' &&
-	git-svn dcommit &&
 	mv $GIT_DIR/svn/* $GIT_DIR/ &&
+	mv $GIT_DIR/svn/.metadata $GIT_DIR/ &&
 	rmdir $GIT_DIR/svn &&
 	git-update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
 	git-update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
@@ -30,20 +35,28 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
 	! test -d $GIT_DIR/git-svn &&
 	git-rev-parse --verify refs/remotes/git-svn^0 &&
 	git-rev-parse --verify refs/remotes/svn^0 &&
-	test \`git repo-config --get svn-remote.git-svn.url\` = '$svnrepo' &&
-	test \`git repo-config --get svn-remote.git-svn.fetch\` = \
+	test \`git config --get svn-remote.svn.url\` = '$svnrepo' &&
+	test \`git config --get svn-remote.svn.fetch\` = \
              ':refs/remotes/git-svn'
 	"
 
 test_expect_success 'initialize a multi-repository repo' "
-	git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
-	git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
+	git-svn init $svnrepo -T trunk -t tags -b branches &&
+	git-config --get-all svn-remote.svn.fetch > fetch.out &&
 	grep '^trunk:refs/remotes/trunk$' fetch.out &&
-	grep '^branches/a:refs/remotes/a$' fetch.out &&
-	grep '^branches/b:refs/remotes/b$' fetch.out &&
-	grep '^tags/0\.1:refs/remotes/tags/0\.1$' fetch.out &&
-	grep '^tags/0\.2:refs/remotes/tags/0\.2$' fetch.out &&
-	grep '^tags/0\.3:refs/remotes/tags/0\.3$' fetch.out
+	test -n \"\`git-config --get svn-remote.svn.branches \
+	            '^branches/\*:refs/remotes/\*$'\`\" &&
+	test -n \"\`git-config --get svn-remote.svn.tags \
+	            '^tags/\*:refs/remotes/tags/\*$'\`\" &&
+	git config --unset svn-remote.svn.branches \
+	                        '^branches/\*:refs/remotes/\*$' &&
+	git config --unset svn-remote.svn.tags \
+	                        '^tags/\*:refs/remotes/tags/\*$' &&
+	git-config --add svn-remote.svn.fetch 'branches/a:refs/remotes/a' &&
+	git-config --add svn-remote.svn.fetch 'branches/b:refs/remotes/b' &&
+	for i in tags/0.1 tags/0.2 tags/0.3; do
+		git-config --add svn-remote.svn.fetch \
+		                 \$i:refs/remotes/\$i || exit 1; done
 	"
 
 # refs should all be different, but the trees should all be the same:
@@ -60,9 +73,9 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
 	                         refs/remotes/\$j\`\" ||exit 1; done; done
 	"
 
-test_expect_success 'migrate --minimize on old multi-inited layout' "
-	git repo-config --unset-all svn-remote.git-svn.fetch &&
-	git repo-config --unset-all svn-remote.git-svn.url &&
+test_expect_success 'migrate --minimize on old inited layout' "
+	git config --unset-all svn-remote.svn.fetch &&
+	git config --unset-all svn-remote.svn.url &&
 	rm -rf $GIT_DIR/svn &&
 	for i in \`cat fetch.out\`; do
 		path=\`expr \$i : '\\([^:]*\\):.*$'\`
@@ -73,8 +86,8 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
 		echo $svnrepo\$path > $GIT_DIR/svn/\$ref/info/url ) || exit 1;
 	done &&
 	git-svn migrate --minimize &&
-	test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
-	git-repo-config --get-all svn-remote.git-svn.fetch > fetch.out &&
+	test -z \"\`git-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
+	git-config --get-all svn-remote.svn.fetch > fetch.out &&
 	grep '^trunk:refs/remotes/trunk$' fetch.out &&
 	grep '^branches/a:refs/remotes/a$' fetch.out &&
 	grep '^branches/b:refs/remotes/b$' fetch.out &&
@@ -84,5 +97,15 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
 	grep '^:refs/remotes/git-svn' fetch.out
 	"
 
-test_done
+test_expect_success  ".rev_db auto-converted to .rev_db.UUID" "
+	git-svn fetch -i trunk &&
+	expect=$GIT_DIR/svn/trunk/.rev_db.* &&
+	test -n \"\$expect\" &&
+	mv \$expect $GIT_DIR/svn/trunk/.rev_db &&
+	git-svn fetch -i trunk &&
+	test -L $GIT_DIR/svn/trunk/.rev_db &&
+	test -f \$expect &&
+	cmp \$expect $GIT_DIR/svn/trunk/.rev_db
+	"
 
+test_done