X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a5907a0b0d47d82fd4fccd13e9a7f5ec877cb66e..db73f81258220fb64f96b6ba45793b6ded2861dd:/ikiwiki-makerepo diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo index dd23b4638..aef3e4d0f 100755 --- 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,29 @@ 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 + repodir=$(dirname "$repository") + mkdir -p "$repodir" + file_basename=$(basename -s .monotone "$repository" |\ + tr -s "[:space:]" "_" | sed 's/_$//g') + reverse_hostname=$((hostname -f 2>/dev/null || hostname) |\ + tr "." "\n" | tail -r | tr "\n" ".") + branch_name="$reverse_hostname$file_basename" + reponame_with_ext="$file_basename.mtn" + mtn db init -d "$repodir/$reponame_with_ext" + mtn setup -d "$repodir/$reponame_with_ext" -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 "Unsupported revision control system $rcs" >&2 usage