X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/db73f81258220fb64f96b6ba45793b6ded2861dd..7bf1207c07c12623f6afc791bf33037b92477c93:/ikiwiki-makerepo diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo index aef3e4d0f..32a9f8646 100755 --- a/ikiwiki-makerepo +++ b/ikiwiki-makerepo @@ -75,7 +75,7 @@ mercurial) hg init "$srcdir" cd "$srcdir" echo .ikiwiki > .hgignore - hg add * .hgignore + hg add hg commit -m "initial import" echo "Directory $srcdir is now set up as a mercurial repository" ;; @@ -83,7 +83,7 @@ bzr) bzr init "$srcdir" cd "$srcdir" echo .ikiwiki > .bzrignore - bzr add * .bzrignore + bzr add bzr commit -m "initial import" echo "Directory $srcdir is now set up as a bzr repository" ;; @@ -92,16 +92,16 @@ monotone) 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" + + 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 . @@ -109,6 +109,17 @@ monotone) # 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