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

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

master
Joey Hess 2008-04-17 14:37:55 -04:00
parent e91b128338
commit f1228946bd
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/NEWS vendored
View File

@ -49,8 +49,8 @@ ikiwiki (2.30) unstable; urgency=low
from this version. If you were subscribed to commit mails, you should be 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. 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 The "notify" field in setup files is no longer used, and
silently ignored. You may want to remove them from your setup file. 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 -- Joey Hess <joeyh@debian.org> Tue, 29 Jan 2008 17:18:31 -0500

7
debian/changelog vendored
View File

@ -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 ikiwiki (2.43) unstable; urgency=low
* Fix missing import of escapeHTML in userlink. (Scott Bronson) * Fix missing import of escapeHTML in userlink. (Scott Bronson)

1
doc/ikiwiki.setup
View File

@ -23,6 +23,7 @@ use IkiWiki::Setup::Standard {
#rcs => "svn", #rcs => "svn",
#historyurl => "http://svn.example.org/trunk/[[file]]", #historyurl => "http://svn.example.org/trunk/[[file]]",
#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]", #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]",
#svnrepo => "/svn/wiki",
#svnpath => "trunk", #svnpath => "trunk",
# Git stuff. # Git stuff.

3
doc/setup.mdwn
View File

@ -186,7 +186,8 @@ about using the git repositories.
Once your wiki is checked in to the revision control system, Once your wiki is checked in to the revision control system,
you should configure ikiwiki to use revision control. Edit your you should configure ikiwiki to use revision control. Edit your
ikiwiki.setup, and uncomment the lines for the revision control system 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 control system, and configure the wrapper path in that block
appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`). appropriately (for Git, it should be `$REPOSITORY/hooks/post-update`).

4
doc/usage.mdwn
View File

@ -144,6 +144,10 @@ configuration options of their own.
No revision control is enabled by default. No revision control is enabled by default.
* --svnrepo /svn/wiki
Specify the location of the svn repository for the wiki.
* --svnpath trunk * --svnpath trunk
Specify the path inside your svn repository where the wiki is located. Specify the path inside your svn repository where the wiki is located.

1
t/svn.t
View File

@ -21,6 +21,7 @@ BEGIN { use_ok("IkiWiki"); }
%config=IkiWiki::defaultconfig(); %config=IkiWiki::defaultconfig();
$config{rcs} = "svn"; $config{rcs} = "svn";
$config{srcdir} = "$dir/src"; $config{srcdir} = "$dir/src";
$config{svnrepo} = "$dir/repo";
$config{svnpath} = "trunk"; $config{svnpath} = "trunk";
IkiWiki::checkconfig(); IkiWiki::checkconfig();