X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/491847ed5311123b3ce58c636451c56a2a0f191b..be092e56395fd70df71a062492e97794650ebf40:/ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index a6999cb4a..c3d835c30 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -4,10 +4,10 @@ set -e
 rcs="$1"
 srcdir="$2"
 repository="$3"
-	
+
 usage () {
-	echo "usage: ikiwiki-makerepo svn|git srcdir repository" >&2
-	echo "       ikiwiki-makerepo mercurial srcdir" >&2
+	echo "usage: ikiwiki-makerepo svn|git|monotone srcdir repository" >&2
+	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
 	exit 1
 }
 
@@ -20,12 +20,16 @@ if [ ! -d "$srcdir" ]; then
 	exit 1
 fi
 
-if [ "$rcs" != mercurial ]; then
+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
@@ -50,14 +54,20 @@ svn)
 	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
+	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"
 ;;
@@ -69,6 +79,48 @@ 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"
+;;
+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