Merge branch 'master' into prefix-directives

1 files changed, 10 insertions, 2 deletions

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 423c4d93b..dd23b4638 100755
--- 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,7 +20,7 @@ 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
@@ -73,6 +73,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