From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 17 Apr 2008 18:37:55 +0000 (-0400)
Subject: Bring back the svnrepo setup file option. This is needed for recentchangediff to... 
X-Git-Tag: 2.44~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f1228946bd62b7b4528bccabe91f836a16912e28

Bring back the svnrepo setup file option. This is needed for recentchangediff to work with svn repos.
---

diff --git a/debian/NEWS b/debian/NEWS
index 658fc0041..983d1ae9d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -49,8 +49,8 @@ ikiwiki (2.30) unstable; urgency=low
   from this version. If you were subscribed to commit mails, you should be
   able to accomplish the same thing by subscribing to a RecentChanges feed.
 
-  The "svnrepo" and "notify" fields in setup files are no longer used, and
-  silently ignored. You may want to remove them from your setup file.
+  The "notify" field in setup files is no longer used, and
+  silently ignored. You may want to remove it from your setup file.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 29 Jan 2008 17:18:31 -0500
 
diff --git a/debian/changelog b/debian/changelog
index fc8b58860..2b3b756f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (2.44) UNRELEASED; urgency=low
+
+  * Bring back the svnrepo setup file option. This is needed for
+    recentchangediff to work with svn repos.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 17 Apr 2008 14:33:54 -0400
+
 ikiwiki (2.43) unstable; urgency=low
 
   * Fix missing import of escapeHTML in userlink. (Scott Bronson)
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 039ebb127..885f77813 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -23,6 +23,7 @@ use IkiWiki::Setup::Standard {
 	#rcs => "svn",
 	#historyurl => "http://svn.example.org/trunk/[[file]]",
 	#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]",
+	#svnrepo => "/svn/wiki",
 	#svnpath => "trunk",
 
 	# Git stuff.
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 7f3f6840d..6aabf53db 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -186,7 +186,8 @@ about using the git repositories.
 Once your wiki is checked in to the revision control system,
 you should configure ikiwiki to use revision control. Edit your
 ikiwiki.setup, and uncomment the lines for the revision control system
-you chose to use. Uncomment the block for the wrapper for your revision
+you chose to use. Be sure to set `svnrepo` to $REPOSITORY, if using
+subversion. Uncomment the block for the wrapper for your revision
 control system, and configure the wrapper path in that block
 appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).
 
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 4c08c5b39..82e443bea 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -144,6 +144,10 @@ configuration options of their own.
 
   No revision control is enabled by default.
 
+* --svnrepo /svn/wiki
+
+  Specify the location of the svn repository for the wiki.
+
 * --svnpath trunk
 
   Specify the path inside your svn repository where the wiki is located.
diff --git a/t/svn.t b/t/svn.t
index 8a8282c73..eba8c65ef 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -21,6 +21,7 @@ BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "svn";
 $config{srcdir} = "$dir/src";
+$config{svnrepo} = "$dir/repo";
 $config{svnpath} = "trunk";
 IkiWiki::checkconfig();