From 2b7a003794537ebf8e02f122cc2743834b47a396 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 13 Aug 2009 16:56:26 -0400
Subject: Add my CVS plugin and related patches.

---
 ikiwiki-makerepo | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

(limited to 'ikiwiki-makerepo')

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 7f82e7177..bf33a3a80 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,7 +6,7 @@ srcdir="$2"
 repository="$3"
 
 usage () {
-	echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2
+	echo "usage: ikiwiki-makerepo cvs|svn|git|monotone|darcs srcdir repository" >&2
 	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
 	exit 1
 }
@@ -39,6 +39,56 @@ fi
 echo "Importing $srcdir into $rcs"
 
 case "$rcs" in
+cvs)
+	if [ -e "$srcdir/CVS" ]; then
+		echo "$srcdir already seems to be a cvs working copy" >&2
+		exit 1
+	fi
+	cvs -Q -d "$repository" init
+	cat > "$repository/CVSROOT/post-commit-wrapper" <<EOF
+#!/bin/sh
+
+IKIWIKI_POST_COMMIT_HOOK="$repository/CVSROOT/post-commit"
+
+exists_ikiwiki_post_commit_hook() {
+	[ -x \$IKIWIKI_POST_COMMIT_HOOK ];
+}
+
+called_with_exactly_one_dir() {
+	echo "\$@" | grep 'New directory' >/dev/null 2>&1
+}
+
+main() {
+	exists_ikiwiki_post_commit_hook || exit 0
+	called_with_exactly_one_dir "\$@" && exit 0
+	# Return from commit and relinquish write lock. ikiwiki post-commit
+	# wants to "cvs update", which wants to take a read lock.
+	\$IKIWIKI_POST_COMMIT_HOOK &
+	return 0
+}
+
+main "\$@"
+exit \$?
+EOF
+	chmod +x "$repository/CVSROOT/post-commit-wrapper"
+	cd "$srcdir"/..
+	cvs -Q -d "$repository" get -P CVSROOT
+	cd CVSROOT
+	echo .ikiwiki >> cvsignore
+	cvs -Q add cvsignore
+	echo "^ikiwiki $repository/CVSROOT/post-commit-wrapper %{sVv}" >> loginfo
+	cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
+	cd ..
+	rm -rf CVSROOT
+	cd "$srcdir"
+	cvs -Q -d "$repository" import -m "initial import" ikiwiki IKIWIKI PRE_CVS
+	cd ..
+	mv "$srcdir" "$srcdir.orig"
+	cvs -Q -d "$repository" get -P -d "$(basename "$srcdir")" ikiwiki
+	[ -d "$srcdir.orig/.ikiwiki" ] && mv "$srcdir.orig/.ikiwiki" "$srcdir"
+	rm -rf "$srcdir.orig"
+	echo "Directory $srcdir is now a checkout of $rcs repository $repository"
+;;
 svn)
 	if [ -e "$srcdir/.svn" ]; then
 		echo "$srcdir already seems to be a svn working copy" >&2
-- 
cgit v1.2.3


From 8f15311597c257eca37c1f20769b80ef8f6c82c0 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 02:05:59 -0400
Subject: No more wrapper wrapper.

---
 ikiwiki-makerepo | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'ikiwiki-makerepo')

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index bf33a3a80..aca8da153 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -45,38 +45,12 @@ cvs)
 		exit 1
 	fi
 	cvs -Q -d "$repository" init
-	cat > "$repository/CVSROOT/post-commit-wrapper" <<EOF
-#!/bin/sh
-
-IKIWIKI_POST_COMMIT_HOOK="$repository/CVSROOT/post-commit"
-
-exists_ikiwiki_post_commit_hook() {
-	[ -x \$IKIWIKI_POST_COMMIT_HOOK ];
-}
-
-called_with_exactly_one_dir() {
-	echo "\$@" | grep 'New directory' >/dev/null 2>&1
-}
-
-main() {
-	exists_ikiwiki_post_commit_hook || exit 0
-	called_with_exactly_one_dir "\$@" && exit 0
-	# Return from commit and relinquish write lock. ikiwiki post-commit
-	# wants to "cvs update", which wants to take a read lock.
-	\$IKIWIKI_POST_COMMIT_HOOK &
-	return 0
-}
-
-main "\$@"
-exit \$?
-EOF
-	chmod +x "$repository/CVSROOT/post-commit-wrapper"
 	cd "$srcdir"/..
 	cvs -Q -d "$repository" get -P CVSROOT
 	cd CVSROOT
 	echo .ikiwiki >> cvsignore
 	cvs -Q add cvsignore
-	echo "^ikiwiki $repository/CVSROOT/post-commit-wrapper %{sVv}" >> loginfo
+	echo "^ikiwiki $repository/CVSROOT/post-commit %{sVv} &" >> loginfo
 	cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
 	cd ..
 	rm -rf CVSROOT
-- 
cgit v1.2.3