releasing version 3.20120629

[git.ikiwiki.info.git] / ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index bf33a3a803704cb870d2c85fc8a2ab63a0ccf16f..c3a13c214330e32fe9473f6891608b6b53872f85 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,7 +6,7 @@ srcdir="$2"
 repository="$3"
 
 usage () {
 repository="$3"
 
 usage () {

-       echo "usage: ikiwiki-makerepo cvs|svn|git|monotone|darcs srcdir repository" >&2
+       echo "usage: ikiwiki-makerepo svn|git|svn|monotone|darcs|cvs srcdir repository" >&2

        echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
        exit 1
 }
        echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
        exit 1
 }


@@ -45,38 +45,12 @@ cvs)
                exit 1
        fi
        cvs -Q -d "$repository" init
                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
        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
        cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
        cd ..
        rm -rf CVSROOT


@@ -112,7 +86,6 @@ git)
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore

-       echo /recentchanges >> .gitignore

        git add .
        git commit -m "initial commit"
        git remote add origin "$repository"
        git add .
        git commit -m "initial commit"
        git remote add origin "$repository"