Merge branch 'master' into pedigree

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 423c4d93b85573262c5677a6515c7de6bd329e84..d249e5e754c00a36ee29b6b6d667017c6b71bdda 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -7,7 +7,7 @@ repository="$3"
        
 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
 }
 
@@ -20,12 +20,12 @@ if [ ! -d "$srcdir" ]; then
        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
-       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 +58,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"
 ;;
@@ -73,6 +75,14 @@ mercurial)
        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