releasing version 2.64

[ikiwiki.git] / ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index dd23b4638a88b76367e638719d4e58247b8edfed..c3d835c308436a5a50d158420ba827c80b95e8af 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -4,9 +4,9 @@ set -e
 rcs="$1"
 srcdir="$2"
 repository="$3"
-       
+
 usage () {
-       echo "usage: ikiwiki-makerepo svn|git srcdir repository" >&2
+       echo "usage: ikiwiki-makerepo svn|git|monotone srcdir repository" >&2
        echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
        exit 1
 }
@@ -21,11 +21,15 @@ if [ ! -d "$srcdir" ]; then
 fi
 
 if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
+       if [ -z "$repository" ]; then
+               echo "you need to specify both a srcdir and a repository for $rcs" >&2
+               usage
+       fi
        if [ -e "$repository" ]; then
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi
-       repository="$(perl -e 'use Cwd q{abs_path}; print abs_path(shift)' $repository)"
+       repository="$(perl -e 'use Cwd q{abs_path}; $r=shift; $r=~s/\/*$//; print abs_path($r)' "$repository")"
        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1
@@ -58,10 +62,12 @@ git)
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore
+       echo /recentchanges >> .gitignore
        git add .
        git commit -m "initial commit"
        git remote add origin "$repository"
        git config branch.master.merge refs/heads/master
+       git config branch.master.remote origin
        git push --all
        echo "Directory $srcdir is now a clone of $rcs repository $repository"
 ;;
@@ -81,6 +87,40 @@ bzr)
        bzr commit -m "initial import"
        echo "Directory $srcdir is now set up as a bzr repository"
 ;;
+monotone)
+       if [ -e "$srcdir/_MTN" ]; then
+               echo "$srcdir already seems to be a monotone working copy" >&2
+               exit 1
+       fi
+
+       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 .
+       # this expects that you already have a working mtn environment
+       # 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"
+;;
 *)
        echo "Unsupported revision control system $rcs" >&2
        usage