From 42d328701dbdbc02c3361673629a44df478e69d7 Mon Sep 17 00:00:00 2001 From: Eric Wong <normalperson@yhbt.net> Date: Tue, 13 Jun 2006 04:02:23 -0700 Subject: git-svn: make the $GIT_DIR/svn/*/revs directory obsolete This is a very intrusive change, so I've beefed up the tests significantly. Added 'full-test' a target to the Makefile, to test different possible configurations. This is intended for maintainers only. Users should only be concerned with 'test' succeeding. We now have a very simple custom database format for handling mapping of svn revisions => git commits. Of course, we're not really using it yet, either. Also disabled automatic branch-finding on new trees for now. It's too easily broken. revisions_eq() function should be helpful for branch detection. Also removed an extra assertion in fetch_cmd() that wasn't correctly done. This bug was found by full-test. Signed-off-by: Eric Wong <normalperson@yhbt.net> --- contrib/git-svn/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index 48f60b3a0d..d73aa5641c 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -29,8 +29,16 @@ git-svn.html : git-svn.txt asciidoc -b xhtml11 -d manpage \ -f ../../Documentation/asciidoc.conf $< test: git-svn - cd t && $(SHELL) ./t0000-contrib-git-svn.sh - cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh + cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS) + cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS) + +full-test: + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ + LC_ALL=en_US.UTF-8 + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ + LC_ALL=en_US.UTF-8 clean: rm -f git-svn *.xml *.html *.1 -- cgit v1.2.3 From 86f363791b281fb916414a89282b2e67cdaa36c0 Mon Sep 17 00:00:00 2001 From: Eric Wong <normalperson@yhbt.net> Date: Thu, 15 Jun 2006 19:13:56 -0700 Subject: git-svn: tests no longer fail if LC_ALL is not a UTF-8 locale Signed-off-by: Eric Wong <normalperson@yhbt.net> --- contrib/git-svn/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index d73aa5641c..6aedb10f12 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -32,9 +32,10 @@ test: git-svn cd t && $(SHELL) ./t0000-contrib-git-svn.sh $(TEST_FLAGS) cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS) +# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL full-test: - $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 - $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 + $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C + $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C $(MAKE) test GIT_SVN_NO_LIB=1 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ LC_ALL=en_US.UTF-8 $(MAKE) test GIT_SVN_NO_LIB=0 GIT_SVN_NO_OPTIMIZE_COMMITS=0 \ -- cgit v1.2.3