X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/18d24036477223794e8319428cd7ba971129c29c..56b9b85e3332fbb920fb74b4dd30574fce6dc469:/IkiWiki/Rcs/svn.pm?ds=inline

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 6c15c2ca9..9b8d4be13 100644
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -1,23 +1,58 @@
 #!/usr/bin/perl
 
-package IkiWiki::Rcs::svn;
+package IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 
-sub import { #{{{
-	if (exists $IkiWiki::config{svnpath}) {
+hook(type => "checkconfig", id => "svn", call => sub { #{{{
+	if (! defined $config{svnpath}) {
+		$config{svnpath}="trunk";
+	}
+	if (exists $config{svnpath}) {
 		# code depends on the path not having extraneous slashes
-		$IkiWiki::config{svnpath}=~tr#/#/#s;
-		$IkiWiki::config{svnpath}=~s/\/$//;
-		$IkiWiki::config{svnpath}=~s/^\///;
+		$config{svnpath}=~tr#/#/#s;
+		$config{svnpath}=~s/\/$//;
+		$config{svnpath}=~s/^\///;
 	}
-} #}}}
-
-
-package IkiWiki;
+}); #}}}
+
+hook(type => "getsetup", id => "svn", call => sub { #{{{
+	return
+		svnrepo => {
+			type => "string",
+			default => "",
+			example => "/svn/wiki",
+			description => "subversion repository location",
+			safe => 0, # path
+			rebuild => 0,
+		},
+		svnpath => {
+			type => "string",
+			default => "trunk",
+			description => "path inside repository where the wiki is located",
+			safe => 0, # paranoia
+			rebuild => 0,
+		},
+		historyurl => {
+			type => "string",
+			default => "",
+			example => "http://svn.example.org/trunk/[[file]]",
+			description => "viewvc url to show file history ([[file]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+		diffurl => {
+			type => "string",
+			default => "",
+			example => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+			description => "viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)",
+			safe => 1,
+			rebuild => 1,
+		},
+}); #}}}
 
 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
@@ -117,6 +152,28 @@ sub rcs_commit ($$$;$$) { #{{{
 	return undef # success
 } #}}}
 
+sub rcs_commit_staged ($$$) {
+	# Commits all staged changes. Changes can be staged using rcs_add,
+	# rcs_remove, and rcs_rename.
+	my ($message, $user, $ipaddr)=@_;
+	
+	if (defined $user) {
+		$message="web commit by $user".(length $message ? ": $message" : "");
+	}
+	elsif (defined $ipaddr) {
+		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
+	}
+	
+	if (system("svn", "commit", "--quiet",
+	           "--encoding", "UTF-8", "-m",
+	           possibly_foolish_untaint($message),
+		   $config{srcdir}) != 0) {
+		warn("svn commit failed\n");
+		return 1; # failure	
+	}
+	return undef # success
+}
+
 sub rcs_add ($) { #{{{
 	# filename is relative to the root of the srcdir
 	my $file=shift;
@@ -139,18 +196,35 @@ sub rcs_remove ($) { #{{{
 	my $file=shift;
 
 	if (-d "$config{srcdir}/.svn") {
-		my $parent=dirname($file);
-		while (! -d "$config{srcdir}/$parent/.svn") {
-			$file=$parent;
-			$parent=dirname($file);
-		}
-		
 		if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
 			warn("svn rm failed\n");
 		}
 	}
 } #}}}
 
+sub rcs_rename ($$) { #{{{
+	# filenames relative to the root of the srcdir
+	my ($src, $dest)=@_;
+	
+	if (-d "$config{srcdir}/.svn") {
+		# Add parent directory for $dest
+		my $parent=dirname($dest);
+		if (! -d "$config{srcdir}/$parent/.svn") {
+			while (! -d "$config{srcdir}/$parent/.svn") {
+				$parent=dirname($dest);
+			}
+			if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
+				warn("svn add $parent failed\n");
+			}
+		}
+
+		if (system("svn", "mv", "--force", "--quiet", 
+		    "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
+			warn("svn rename failed\n");
+		}
+	}
+} #}}}
+
 sub rcs_recentchanges ($) { #{{{
 	my $num=shift;
 	my @ret;