urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the one directory form for darcs 

I see no need to have darcs have a special case handling for a one
directory form.
master
Joey Hess 2009-04-04 17:53:29 -04:00
parent f7fa696619
commit 2cf63041ac
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/ikiwiki-makerepo.mdwn
View File

@ -6,7 +6,7 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
ikiwiki-makerepo svn|git|monotone|darcs srcdir repository ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
ikiwiki-makerepo bzr|mercurial|darcs srcdir ikiwiki-makerepo bzr|mercurial srcdir
# DESCRIPTION # DESCRIPTION
@ -18,12 +18,8 @@ Note that for mercurial and bzr, the srcdir is converted into a
repository. There is no need to have a separate repository with mercurial repository. There is no need to have a separate repository with mercurial
or bzr. or bzr.
For darcs, the second (one-argument) form turns the given srcdir into a For darcs, the master repo's apply hook will be preconfigured to call a
darcs master repository with the (new) srcdir inside. Adjust your ikiwiki.setup ikiwiki wrapper.
according to the command output! Also, the master repo's apply hook will be
preconfigured to call a (hypothetical) ikiwiki wrapper. The command
reports the relevant file. Adjust it as needed or remove it if you don't use
the cgi script.
Note that for monotone, you are assumed to already have run "mtn genkey" Note that for monotone, you are assumed to already have run "mtn genkey"
to generate key. to generate key.

13
ikiwiki-makerepo
View File

@ -7,7 +7,7 @@ repository="$3"
usage () { usage () {
echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2 echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2
echo " ikiwiki-makerepo bzr|mercurial|darcs srcdir" >&2 echo " ikiwiki-makerepo bzr|mercurial srcdir" >&2
exit 1 exit 1
} }
@ -20,7 +20,7 @@ if [ ! -d "$srcdir" ]; then
exit 1 exit 1
fi fi
if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ] && [ "$rcs" != darcs ]; then if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
if [ -z "$repository" ]; then if [ -z "$repository" ]; then
echo "you need to specify both a srcdir and a repository for $rcs" >&2 echo "you need to specify both a srcdir and a repository for $rcs" >&2
usage usage
@ -127,15 +127,6 @@ darcs)
exit 1 exit 1
fi fi
# if only one arg is given, we turn the given srcdir into the darcs
# master repo with a hidden srcdir inside its _darcs directory.
if [ -z "$repository" ]; then
echo "Turning $srcdir into master repo."
repository="$srcdir"
srcdir="$srcdir/_darcs/srcdir"
echo "The new srcdir is $srcdir - adjust ikiwiki.setup accordingly!"
fi
mkdir -p "$repository" mkdir -p "$repository"
cd "$repository" cd "$repository"
darcs initialize darcs initialize