aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsam@vilain.net <sam@vilain.net>2006-12-05 16:17:38 +1100
committerEric Wong <normalperson@yhbt.net>2007-02-23 00:57:12 -0800
commit2edb9c5cf98e1a65c775ede6fc5b10a15bb94384 (patch)
treedfecb167d17df72e9b767393bee3087654792cdd
parentdb03cd24a155a727349a47ce0e5ba3f4c4032cb8 (diff)
downloadgit-2edb9c5cf98e1a65c775ede6fc5b10a15bb94384.tar.gz
git-2edb9c5cf98e1a65c775ede6fc5b10a15bb94384.tar.xz
git-svn: make test for SVK mirror path import
A manual test that sets up a repository that looks like an SVK depot, and then imports it to check that it looks like we mirrored the 'original' source. There is also a minor modification to the git-svn test library shell file which sets a variable for the subversion repository's filesystem path. [ew: made some of the tests stricter and more thorough] Signed-off-by: Eric Wong <normalperson@yhbt.net>
-rw-r--r--t/lib-git-svn.sh2
-rwxr-xr-xt/t9109-git-svn-svk-mirrorpaths.sh104
2 files changed, 105 insertions, 1 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 67d08cf74..27ad3b70f 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -42,9 +42,9 @@ then
exit
fi
+rawsvnrepo="$svnrepo"
svnrepo="file://$svnrepo"
-
poke() {
perl -e '@x = stat($ARGV[0]); utime($x[8], $x[9] + 1, $ARGV[0])' "$1"
}
diff --git a/t/t9109-git-svn-svk-mirrorpaths.sh b/t/t9109-git-svn-svk-mirrorpaths.sh
new file mode 100755
index 000000000..0e0ba3df3
--- /dev/null
+++ b/t/t9109-git-svn-svk-mirrorpaths.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Sam Vilian
+#
+
+test_description='git-svn on SVK mirror paths'
+. ./lib-git-svn.sh
+
+# ok, people who don't have SVK installed probably don't care about
+# this test.
+
+# we set up the repository manually, because even if SVK is installed
+# it is difficult to use it in a way that is idempotent.
+
+# we are not yet testing merge tickets..
+
+uuid=b00bface-b1ff-c0ff-f0ff-b0bafe775e1e
+url=https://really.slow.server.com/foobar
+
+test_expect_success 'initialize repo' "
+ git config svn-remote.svn.useSvmProps true &&
+
+ echo '#!/bin/sh' > $rawsvnrepo/hooks/pre-revprop-change &&
+ echo 'exit 0' >> $rawsvnrepo/hooks/pre-revprop-change &&
+ chmod +x $rawsvnrepo/hooks/pre-revprop-change &&
+
+ mkdir import &&
+ cd import &&
+ mkdir local &&
+ echo hello > local/readme &&
+ svn import -m 'random local work' . $svnrepo &&
+ cd .. &&
+
+ svn co $svnrepo wc &&
+ cd wc &&
+ mkdir -p mirror/foobar &&
+ svn add mirror &&
+ svn ps svm:source $url mirror/foobar &&
+ svn ps svm:uuid $uuid mirror/foobar &&
+ svn ps svm:mirror / mirror/foobar &&
+ svn commit -m 'setup mirror/foobar as mirror of upstream' &&
+ svn ps -r 2 --revprop svm:headrev $uuid:0 $svnrepo &&
+
+ mkdir mirror/foobar/trunk
+ echo hello, world > mirror/foobar/trunk/readme &&
+ svn add mirror/foobar/trunk &&
+ svn commit -m 'first upstream revision' &&
+ svn ps -r 3 --revprop svm:headrev $uuid:1 $svnrepo &&
+
+ svn up &&
+ svn mkdir mirror/foobar/branches &&
+ svn cp mirror/foobar/trunk mirror/foobar/branches/silly &&
+ svn commit -m 'make branch for silliness' &&
+ svn ps -r 4 --revprop svm:headrev $uuid:2 $svnrepo &&
+
+ svn up &&
+ echo random untested feature >> mirror/foobar/trunk/readme &&
+ svn commit -m 'add a c00l feature to trunk' &&
+ svn ps -r 5 --revprop svm:headrev $uuid:3 $svnrepo &&
+
+ svn up &&
+ echo bug fix >> mirror/foobar/branches/silly/readme &&
+ svn commit -m 'fix a bug' &&
+ svn ps -r 6 --revprop svm:headrev $uuid:4 $svnrepo &&
+
+ svn mkdir mirror/foobar/tags &&
+ svn cp mirror/foobar/branches/silly mirror/foobar/tags/blah-1.0 &&
+ svn commit -m 'make a release' &&
+ svn ps -r 7 --revprop svm:headrev $uuid:5 $svnrepo &&
+
+ cd ..
+ "
+
+test_expect_success 'multi-init an SVK mirror path' "
+ git-svn multi-init -T trunk -t tags -b branches $svnrepo/mirror/foobar
+ "
+
+test_expect_success 'multi-fetch an SVK mirror path' "git-svn multi-fetch"
+
+test_expect_success 'got tag history OK' "
+ test \`git-log --pretty=oneline remotes/tags/blah-1.0 | wc -l\` -eq 3
+ "
+
+test_expect_success 're-wrote git-svn-id URL, revision and UUID' "
+ git cat-file commit refs/remotes/trunk | \
+ fgrep 'git-svn-id: $url/mirror/foobar/trunk@3 $uuid' &&
+ git cat-file commit refs/remotes/tags/blah-1.0 | \
+ fgrep 'git-svn-id: $url/mirror/foobar/tags/blah-1.0@5 $uuid'
+ git cat-file commit refs/remotes/silly | \
+ fgrep 'git-svn-id: $url/mirror/foobar/branches/silly@4 $uuid'
+ "
+
+test_expect_success 're-wrote author e-mail domain UUID' "
+ test \`git log --pretty=fuller trunk | \
+ grep '<.*@.*>' | fgrep '@$uuid>' | wc -l\` -eq 4 &&
+ test \`git log --pretty=fuller remotes/silly | \
+ grep '<.*@.*>' | fgrep '@$uuid>' | wc -l\` -eq 6 &&
+ test \`git log --pretty=fuller remotes/tags/blah-1.0 | \
+ grep '<.*@.*>' | fgrep '@$uuid>' | wc -l\` -eq 6
+ "
+
+test_debug 'gitk --all &'
+
+test_done