From ca5704936d1d57fdd11ea850608e6fa9d574d9dd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 4 Apr 2009 18:04:20 -0400
Subject: update docs for darcs

Deleted all the old incomplete implementations.

Moved explanation of the two-repo system currently implemented for darcs
into rcs/details, and removed discussion from there about other methods
(including one-repo).

Wrote a rcs/darcs page, which I hope is accurate.
---
 doc/rcs/darcs.mdwn | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 doc/rcs/darcs.mdwn

(limited to 'doc/rcs/darcs.mdwn')

diff --git a/doc/rcs/darcs.mdwn b/doc/rcs/darcs.mdwn
new file mode 100644
index 000000000..7f66d0808
--- /dev/null
+++ b/doc/rcs/darcs.mdwn
@@ -0,0 +1,15 @@
+[Darcs](http://darcs.new) is a distributed revison control
+system. Ikiwiki supports storing a wiki in a
+Darcs repository.
+
+An Ikiwiki wrapper is run by the `posthook` to update a wiki whenever commits
+or remote pushes come in. When running as a [[cgi]] with Darcs, ikiwiki
+automatically commits edited pages, and uses the Darcs history to generate the
+[[RecentChanges]] page.
+
+Example for a `_darcs/prefs/defaults` file in `$SRCDIR`:
+
+	apply posthook /path/to/repository/_darcs/ikiwrapper
+	apply run-posthook
+
+See also [[todo/darcs|todo/darcs]]
-- 
cgit v1.2.3


From a9c0d7e288d06a43e4e3d03e3ff8496e99e80962 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 4 Apr 2009 18:17:38 -0400
Subject: support darcs in setup automator

use a consistent name for the ikiwiki wrapper file
---
 IkiWiki/Setup/Automator.pm | 3 +++
 doc/rcs/darcs.mdwn         | 2 +-
 ikiwiki-makerepo           | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'doc/rcs/darcs.mdwn')

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 7d9eca3af..f1ed57b4b 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -58,6 +58,9 @@ sub import (@) {
 		elsif ($config{rcs} eq 'monotone') {
 			$config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
 		}
+		elsif ($config{rcs} eq 'darcs') {
+			$config{darcs_wrapper}=$config{repository}."_darcs/ikiwiki-wrapper";
+		}
 		elsif ($config{rcs} eq 'bzr') {
 			# TODO
 		}
diff --git a/doc/rcs/darcs.mdwn b/doc/rcs/darcs.mdwn
index 7f66d0808..fbb9bcede 100644
--- a/doc/rcs/darcs.mdwn
+++ b/doc/rcs/darcs.mdwn
@@ -9,7 +9,7 @@ automatically commits edited pages, and uses the Darcs history to generate the
 
 Example for a `_darcs/prefs/defaults` file in `$SRCDIR`:
 
-	apply posthook /path/to/repository/_darcs/ikiwrapper
+	apply posthook /path/to/repository/_darcs/ikiwiki-wrapper
 	apply run-posthook
 
 See also [[todo/darcs|todo/darcs]]
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 787611ac1..8d590f0c2 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -143,7 +143,7 @@ darcs)
 	# set up master repo's apply hook and tell user to adjust it if desired
 	darcsdefaults="$repository/_darcs/prefs/defaults"
 	echo "Preconfiguring apply hook in $darcsdefaults - adjust as desired!"
-	echo "apply posthook $repository/_darcs/ikiwrapper" >> "$darcsdefaults"
+	echo "apply posthook $repository/_darcs/ikiwiki-wrapper" >> "$darcsdefaults"
 	echo "apply run-posthook" >> "$darcsdefaults"
 ;;
 *)
-- 
cgit v1.2.3