From 03020563327db62bcbecadea700f5f534158cef3 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 29 Mar 2007 18:27:00 +0000
Subject: [PATCH] * Add --post-commit option, which allows for the case of a
 split web server   and RCS server (or a push mirror). With this the RCS
 server can have a   real post-commit hook that sshs back to the web server,
 and runs ikiwiki   in post-commit mode to update the wiki.

---
 debian/changelog |  9 +++++++++
 doc/usage.mdwn   | 10 +++++++++-
 ikiwiki.in       |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index db237afa6..08eee7a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ikiwiki (1.49) UNRELEASED; urgency=low
+
+  * Add --post-commit option, which allows for the case of a split web server
+    and RCS server (or a push mirror). With this the RCS server can have a
+    real post-commit hook that sshs back to the web server, and runs ikiwiki
+    in post-commit mode to update the wiki.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 29 Mar 2007 14:22:34 -0400
+
 ikiwiki (1.48) unstable; urgency=low
 
   * Fix link() PageSpecs to not just look at the raw link text, but at where
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 24a5515e0..3102245b2 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -86,6 +86,14 @@ These options control the mode that ikiwiki operates in.
 
 	ikiwiki --setup ~/ikiwiki.setup --render foo.mdwn
 
+* --post-commit
+
+  Run in post-commit mode, the same as if called by a [[post-commit]] hook.
+  This is probably only useful when using ikiwiki with a web server on one host
+  and a repository on another, to allow the repository's real post-commit
+  hook to ssh to the web server host and manually run ikiwiki to update
+  the web site.
+
 * --version
 
   Print ikiwiki's version number.
@@ -117,7 +125,7 @@ configuration options of their own.
 
   Specify a mode to chmod the wrapper to after creating it.
 
-* --notify
+* --notify, --no-notify
 
   Enable email notification of commits. This should be used when running
   ikiwiki as a [[post-commit]] hook.
diff --git a/ikiwiki.in b/ikiwiki.in
index 5dd1064f9..8c46d5e9f 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -25,6 +25,7 @@ sub getconfig () { #{{{
 			"syslog!" => \$config{syslog},
 			"rebuild!" => \$config{rebuild},
 			"refresh!" => \$config{refresh},
+			"post-commit" => \$config{post_commit},
 			"render=s" => \$config{render},
 			"wrappers!" => \$config{wrappers},
 			"getctime" => \$config{getctime},
-- 
2.44.0