From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 4 Apr 2009 21:53:29 +0000 (-0400)
Subject: remove the one directory form for darcs
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/2cf63041acc2051d55e0150b3a5b00ed454ae76d

remove the one directory form for darcs

I see no need to have darcs have a special case handling for a one
directory form.
---

diff --git a/doc/ikiwiki-makerepo.mdwn b/doc/ikiwiki-makerepo.mdwn
index 3fbfbdc82..4bb2afa16 100644
--- a/doc/ikiwiki-makerepo.mdwn
+++ b/doc/ikiwiki-makerepo.mdwn
@@ -6,7 +6,7 @@ ikiwiki-makerepo - check an ikiwiki srcdir into revision control
 
 ikiwiki-makerepo svn|git|monotone|darcs srcdir repository
 
-ikiwiki-makerepo bzr|mercurial|darcs srcdir
+ikiwiki-makerepo bzr|mercurial srcdir
 
 # 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
 or bzr.
 
-For darcs, the second (one-argument) form turns the given srcdir into a
-darcs master repository with the (new) srcdir inside. Adjust your ikiwiki.setup
-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.
+For darcs, the master repo's apply hook will be preconfigured to call a
+ikiwiki wrapper.
 
 Note that for monotone, you are assumed to already have run "mtn genkey"
 to generate key.
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 1c9f256bd..787611ac1 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -7,7 +7,7 @@ repository="$3"
 
 usage () {
 	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
 }
 
@@ -20,7 +20,7 @@ if [ ! -d "$srcdir" ]; then
 	exit 1
 fi
 
-if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ] && [ "$rcs" != darcs ]; 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
@@ -127,15 +127,6 @@ darcs)
 		exit 1
 	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"
 	cd "$repository"
 	darcs initialize