t/passwordauth.t: new automated test for passwordauth

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index aef3e4d0f7cd68dab8242958061ac27329f2db82..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 svn|git|monotone 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
 }


@@ -29,7 +29,7 @@ if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi

-       repository="$(perl -e 'use Cwd q{abs_path}; $r=shift; $r=~s/\/*$//; print abs_path($r)' "$repository")"
+       repository="$(perl -e 'use Cwd; $r=shift; $r=getcwd.q{/}.$r if $r!~m!^/!; print $r' "$repository")"

        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1
        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1


@@ -39,6 +39,30 @@ fi
 echo "Importing $srcdir into $rcs"
 
 case "$rcs" in
 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
+       cd "$srcdir"/..
+       cvs -Q -d "$repository" get -P CVSROOT
+       cd CVSROOT
+       echo .ikiwiki >> cvsignore
+       cvs -Q add cvsignore
+       echo "^ikiwiki $repository/CVSROOT/post-commit %{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
 svn)
        if [ -e "$srcdir/.svn" ]; then
                echo "$srcdir already seems to be a svn working copy" >&2


@@ -62,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"


@@ -75,7 +98,7 @@ mercurial)
        hg init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .hgignore
        hg init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .hgignore

-       hg add * .hgignore
+       hg add

        hg commit -m "initial import"
        echo "Directory $srcdir is now set up as a mercurial repository"
 ;;
        hg commit -m "initial import"
        echo "Directory $srcdir is now set up as a mercurial repository"
 ;;


@@ -83,7 +106,7 @@ bzr)
        bzr init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .bzrignore
        bzr init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .bzrignore

-       bzr add * .bzrignore
+       bzr add

        bzr commit -m "initial import"
        echo "Directory $srcdir is now set up as a bzr repository"
 ;;
        bzr commit -m "initial import"
        echo "Directory $srcdir is now set up as a bzr repository"
 ;;


@@ -92,16 +115,16 @@ monotone)
                echo "$srcdir already seems to be a monotone working copy" >&2
                exit 1
        fi
                echo "$srcdir already seems to be a monotone working copy" >&2
                exit 1
        fi

-       repodir=$(dirname "$repository")
-       mkdir -p "$repodir"
-       file_basename=$(basename -s .monotone "$repository" |\
-               tr -s "[:space:]" "_" | sed 's/_$//g')
-       reverse_hostname=$((hostname -f 2>/dev/null || hostname) |\
-               tr  "." "\n" | tail -r | tr "\n" ".")
-       branch_name="$reverse_hostname$file_basename"
-       reponame_with_ext="$file_basename.mtn"
-       mtn db init -d "$repodir/$reponame_with_ext"
-       mtn setup -d "$repodir/$reponame_with_ext" -b "$branch_name" "$srcdir"
+
+       mkdir -p "$(dirname "$repository")"
+       mtn db init -d "$repository"
+
+       cleaned_srcdir=$(basename "$srcdir" | tr -s "[:space:]" "_" | sed 's/_$//g')
+       reverse_hostname=$( (hostname -f 2>/dev/null || hostname) |\
+               tr  "." "\n" | ( tac 2>/dev/null || tail -r ) | tr "\n" "." )
+       branch_name="$reverse_hostname$cleaned_srcdir"
+       mtn setup -d "$repository" -b "$branch_name" "$srcdir"
+

        cd "$srcdir"
        echo \.ikiwiki$ > .mtn-ignore
        mtn add -R .
        cd "$srcdir"
        echo \.ikiwiki$ > .mtn-ignore
        mtn add -R .


@@ -109,6 +132,41 @@ monotone)
        # with a default key floating around...
        mtn ci -m "initial import"
        echo "Directory $srcdir is now set up as a monotone repository"
        # with a default key floating around...
        mtn ci -m "initial import"
        echo "Directory $srcdir is now set up as a monotone repository"

+       echo ""
+       echo "Note: If your monotone key has a passphrase, you need to configure"
+       echo "monotone to automatically use it. Otherwise, web commits to ikiwiki"
+       echo "will fail."
+       echo ""
+       echo "You can create a $srcdir/_MTN/monotonerc"
+       echo "containing the passphrase:"
+       echo ""
+       echo "function get_passphrase (branchname)"
+       echo '    return "passphrasehere"'
+       echo "end"
+;;
+darcs)
+       if [ -e "$srcdir/_darcs" ]; then
+               echo "$srcdir already seems to be a darcs repository" >&2
+               exit 1
+       fi
+
+       mkdir -p "$repository"
+       (cd "$repository" && darcs initialize)
+
+       mkdir -p "$srcdir"
+       cd "$srcdir"
+       darcs initialize
+       echo .ikiwiki >> _darcs/prefs/boring
+       darcs record -a -l -q -m "initial import"
+       darcs pull -a -q "$repository"
+       darcs push -a -q "$repository"
+       echo "Directory $srcdir is now a branch of darcs repo $repository"
+
+       # set up master repo's apply hook and tell user to adjust it if desired
+       darcsdefaults="$repository/_darcs/prefs/defaults"
+       echo "Preconfiguring apply hook in $darcsdefaults - adjust as desired!"
+       echo "apply posthook $repository/_darcs/ikiwiki-wrapper" >> "$darcsdefaults"
+       echo "apply run-posthook" >> "$darcsdefaults"

 ;;
 *)
        echo "Unsupported revision control system $rcs" >&2
 ;;
 *)
        echo "Unsupported revision control system $rcs" >&2