web commit by http://sabr.myopenid.com/: thanks belong at the end of the conversation...

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a6999cb4a32288ef53910c664921661d981306d8..6ae3e28a3a7ee8a9cdc8bd769439c7e8433406cb 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -7,7 +7,7 @@ repository="$3"
        
 usage () {
        echo "usage: ikiwiki-makerepo svn|git srcdir repository" >&2
        
 usage () {
        echo "usage: ikiwiki-makerepo svn|git srcdir repository" >&2

-       echo "       ikiwiki-makerepo mercurial srcdir" >&2
+       echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2

        exit 1
 }
 
        exit 1
 }
 


@@ -20,12 +20,12 @@ if [ ! -d "$srcdir" ]; then
        exit 1
 fi
 
        exit 1
 fi
 

-if [ "$rcs" != mercurial ]; then
+if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then

        if [ -e "$repository" ]; then
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        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
        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1


@@ -50,7 +50,11 @@ svn)
        echo "Directory $srcdir is now a checkout of $rcs repository $repository"
 ;;
 git)
        echo "Directory $srcdir is now a checkout of $rcs repository $repository"
 ;;
 git)

-       GIT_DIR="$repository" git --bare init --shared
+       # There are better ways to do this, but this works with older
+       # versions of git.)
+       mkdir -p "$repository"
+       (cd "$repository" && git --bare init --shared)
+

        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore


@@ -58,6 +62,7 @@ git)
        git commit -m "initial commit"
        git remote add origin "$repository"
        git config branch.master.merge refs/heads/master
        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"
 ;;
        git push --all
        echo "Directory $srcdir is now a clone of $rcs repository $repository"
 ;;


@@ -69,6 +74,14 @@ mercurial)
        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"
 ;;

+bzr)
+       bzr init "$srcdir"
+       cd "$srcdir"
+       echo .ikiwiki > .bzrignore
+       bzr add * .bzrignore
+       bzr commit -m "initial import"
+       echo "Directory $srcdir is now set up as a bzr repository"
+;;

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