From 20b1d700c94c8b5b2b8b6f1b4982858d03cd9453 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 1 Apr 2006 18:25:03 -0800 Subject: contrib/git-svn: documentation updates contrib/git-svn/git-svn.txt: added git-repo-config key names for options fixed quoting of "git-svn-HEAD" in the manpage use preformatted text for examples contrib/git-svn/Makefile: add target to generate HTML: http://git-svn.yhbt.net/git-svn.html Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index a330c617d2..d7f1643bf7 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -25,6 +25,9 @@ git-svn.1 : git-svn.xml git-svn.xml : git-svn.txt asciidoc -b docbook -d manpage \ -f ../../Documentation/asciidoc.conf $< +git-svn.html : git-svn.txt + asciidoc -b xhtml11 -d manpage \ + -f ../../Documentation/asciidoc.conf $< test: cd t && $(SHELL) ./t0000-contrib-git-svn.sh -- cgit v1.2.3 From 5f2f4240022418e9a75505f11298db54a5da12d2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 3 Apr 2006 15:18:49 -0700 Subject: contrib/git-svn: make sure our git-svn is up-to-date for test Bugs like the last one could've been avoided if it weren't for this... Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index d7f1643bf7..acedf7305e 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -28,7 +28,7 @@ git-svn.xml : git-svn.txt git-svn.html : git-svn.txt asciidoc -b xhtml11 -d manpage \ -f ../../Documentation/asciidoc.conf $< -test: +test: git-svn cd t && $(SHELL) ./t0000-contrib-git-svn.sh clean: -- cgit v1.2.3 From 36f5b1f0c800a23b9755a0214c1c3250f34f2486 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 23 May 2006 19:23:41 -0700 Subject: git-svn: ignore expansion of svn:keywords Unlike my earlier test patch, this also checks svn:eol-style and makes sure it's applied to working copy updates. This is definitely more correct than my original attempt at killing keyword expansions, but I still haven't tested it enough to know. Feedback would be much appreciated. Also changed assert_svn_wc_clean() to only work on the svn working copy. This requires a separate call to assert_tree() to check wc integrity against git in preparation for another change I'm planning. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index acedf7305e..48f60b3a0d 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -30,6 +30,7 @@ git-svn.html : git-svn.txt -f ../../Documentation/asciidoc.conf $< test: git-svn cd t && $(SHELL) ./t0000-contrib-git-svn.sh + cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh clean: rm -f git-svn *.xml *.html *.1 -- cgit v1.2.3 From 42d328701dbdbc02c3361673629a44df478e69d7 Mon Sep 17 00:00:00 2001 From: Eric Wong 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 --- 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 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 --- 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 From c07eee1f2ab9e9b168e050c0ef0b48d039c71470 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 19 Jun 2006 17:59:35 -0700 Subject: git-svn: fix --rmdir when using SVN:: libraries When tracking directories with nearly all of its files at the most nested levels, --rmdir would accidentally go too far when deleting. Of course, we'll add a test for this condition, too. Makefile: automatically run new tests as they appear in t/ Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile index 6aedb10f12..7c20946943 100644 --- a/contrib/git-svn/Makefile +++ b/contrib/git-svn/Makefile @@ -29,8 +29,7 @@ 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 $(TEST_FLAGS) - cd t && $(SHELL) ./t0001-contrib-git-svn-props.sh $(TEST_FLAGS) + cd t && for i in t????-*.sh; do $(SHELL) ./$$i $(TEST_FLAGS); done # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL full-test: -- cgit v1.2.3 From 60d02ccc18408e54ace8692532fcc73d4035b3c2 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 6 Jul 2006 00:14:16 -0700 Subject: git-svn: migrate out of contrib Allow NO_SVN_TESTS to be defined to skip git-svn tests. These tests are time-consuming due to SVN being slow, and even more so if SVN Perl libraries are not available. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/Makefile | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 contrib/git-svn/Makefile (limited to 'contrib/git-svn/Makefile') diff --git a/contrib/git-svn/Makefile b/contrib/git-svn/Makefile deleted file mode 100644 index 7c20946943..0000000000 --- a/contrib/git-svn/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -all: git-svn - -prefix?=$(HOME) -bindir=$(prefix)/bin -mandir=$(prefix)/man -man1=$(mandir)/man1 -INSTALL?=install -doc_conf=../../Documentation/asciidoc.conf --include ../../config.mak - -git-svn: git-svn.perl - cp $< $@ - chmod +x $@ - -install: all - $(INSTALL) -d -m755 $(DESTDIR)$(bindir) - $(INSTALL) git-svn $(DESTDIR)$(bindir) - -install-doc: doc - $(INSTALL) git-svn.1 $(DESTDIR)$(man1) - -doc: git-svn.1 -git-svn.1 : git-svn.xml - xmlto man git-svn.xml -git-svn.xml : git-svn.txt - asciidoc -b docbook -d manpage \ - -f ../../Documentation/asciidoc.conf $< -git-svn.html : git-svn.txt - asciidoc -b xhtml11 -d manpage \ - -f ../../Documentation/asciidoc.conf $< -test: git-svn - cd t && for i in t????-*.sh; do $(SHELL) ./$$i $(TEST_FLAGS); done - -# 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 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 \ - LC_ALL=en_US.UTF-8 - -clean: - rm -f git-svn *.xml *.html *.1 -- cgit v1.2.3