X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/54f600af14bf6dc067ffc30ec6f22d517001fe99..ea7e0b77f22d78f1e945b921d68802d916674b51:/IkiWiki/Plugin/svn.pm?ds=inline

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index d10b4888d..8824a6ce0 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -122,10 +122,8 @@ sub svn_info ($$) {
 }
 
 sub rcs_update () {
-	if (-d "$config{srcdir}/.svn") {
-		if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
-			warn("svn update failed\n");
-		}
+	if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
+		warn("svn update failed\n");
 	}
 }
 
@@ -136,74 +134,71 @@ sub rcs_prepedit ($) {
 	# The file is relative to the srcdir.
 	my $file=shift;
 	
-	if (-d "$config{srcdir}/.svn") {
-		# For subversion, return the revision of the file when
-		# editing begins.
-		my $rev=svn_info("Revision", "$config{srcdir}/$file");
-		return defined $rev ? $rev : "";
+	# For subversion, return the revision of the file when
+	# editing begins.
+	my $rev=svn_info("Revision", "$config{srcdir}/$file");
+	return defined $rev ? $rev : "";
+}
+
+sub commitmessage (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
 	}
+	return $params{message};
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
 	# The file is relative to the srcdir.
-	my $file=shift;
-	my $message=shift;
-	my $rcstoken=shift;
-	my $user=shift;
-	my $ipaddr=shift;
-
-	if (defined $user) {
-		$message="web commit by $user".(length $message ? ": $message" : "");
-	}
-	elsif (defined $ipaddr) {
-		$message="web commit from $ipaddr".(length $message ? ": $message" : "");
-	}
-
-	if (-d "$config{srcdir}/.svn") {
-		# Check to see if the page has been changed by someone
-		# else since rcs_prepedit was called.
-		my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
-		my $rev=svn_info("Revision", "$config{srcdir}/$file");
-		if (defined $rev && defined $oldrev && $rev != $oldrev) {
-			# Merge their changes into the file that we've
-			# changed.
-			if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-			           "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
-				warn("svn merge -r$oldrev:$rev failed\n");
-			}
+	my %params=@_;
+
+	# Check to see if the page has been changed by someone
+	# else since rcs_prepedit was called.
+	my ($oldrev)=$params{token}=~/^([0-9]+)$/; # untaint
+	my $rev=svn_info("Revision", "$config{srcdir}/$params{file}");
+	if (defined $rev && defined $oldrev && $rev != $oldrev) {
+		# Merge their changes into the file that we've
+		# changed.
+		if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
+		           "$config{srcdir}/$params{file}", "$config{srcdir}/$params{file}") != 0) {
+			warn("svn merge -r$oldrev:$rev failed\n");
 		}
+	}
 
-		if (system("svn", "commit", "--quiet", 
-		           "--encoding", "UTF-8", "-m",
-		           IkiWiki::possibly_foolish_untaint($message),
-			   $config{srcdir}) != 0) {
-			my $conflict=readfile("$config{srcdir}/$file");
-			if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
-				warn("svn revert failed\n");
-			}
-			return $conflict;
+	if (system("svn", "commit", "--quiet", 
+	           "--encoding", "UTF-8", "-m",
+	           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
+		   $config{srcdir}) != 0) {
+		my $conflict=readfile("$config{srcdir}/$params{file}");
+		if (system("svn", "revert", "--quiet", "$config{srcdir}/$params{file}") != 0) {
+			warn("svn revert failed\n");
 		}
+		return $conflict;
 	}
+
 	return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+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" : "");
-	}
+	my %params=@_;
 	
 	if (system("svn", "commit", "--quiet",
 	           "--encoding", "UTF-8", "-m",
-	           IkiWiki::possibly_foolish_untaint($message),
+	           IkiWiki::possibly_foolish_untaint(commitmessage(%params)),
 		   $config{srcdir}) != 0) {
 		warn("svn commit failed\n");
 		return 1; # failure	
@@ -215,16 +210,8 @@ sub rcs_add ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 
-	if (-d "$config{srcdir}/.svn") {
-		my $parent=IkiWiki::dirname($file);
-		while (! -d "$config{srcdir}/$parent/.svn") {
-			$file=$parent;
-			$parent=IkiWiki::dirname($file);
-		}
-		
-		if (system("svn", "add", "--quiet", "$config{srcdir}/$file") != 0) {
-			warn("svn add failed\n");
-		}
+	if (system("svn", "add", "--parents", "--quiet", "$config{srcdir}/$file") != 0) {
+		warn("svn add failed\n");
 	}
 }
 
@@ -232,10 +219,8 @@ sub rcs_remove ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 
-	if (-d "$config{srcdir}/.svn") {
-		if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
-			warn("svn rm failed\n");
-		}
+	if (system("svn", "rm", "--force", "--quiet", "$config{srcdir}/$file") != 0) {
+		warn("svn rm failed\n");
 	}
 }
 
@@ -243,22 +228,9 @@ 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=IkiWiki::dirname($dest);
-		if (! -d "$config{srcdir}/$parent/.svn") {
-			while (! -d "$config{srcdir}/$parent/.svn") {
-				$parent=IkiWiki::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");
-		}
+	if (system("svn", "mv", "--parents", "--force", "--quiet", 
+	    "$config{srcdir}/$src", "$config{srcdir}/$dest") != 0) {
+		warn("svn rename failed\n");
 	}
 }
 
@@ -266,8 +238,6 @@ sub rcs_recentchanges ($) {
 	my $num=shift;
 	my @ret;
 	
-	return unless -d "$config{srcdir}/.svn";
-
 	eval q{
 		use Date::Parse;
 		use XML::SAX;
@@ -345,8 +315,9 @@ sub rcs_recentchanges ($) {
 	return @ret;
 }
 
-sub rcs_diff ($) {
+sub rcs_diff ($;$) {
 	my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
+	my $maxlines=shift;
 	return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
 }
 
@@ -366,7 +337,7 @@ sub findtimes ($) {
 		
 	my $child = open(SVNLOG, "-|");
 	if (! $child) {
-		exec("svn", "log", $file) || error("svn log $file failed to run");
+		exec("svn", "log", "$config{srcdir}/$file") || error("svn log failed to run");
 	}
 
 	my ($cdate, $mdate);
@@ -376,10 +347,10 @@ sub findtimes ($) {
 			$mdate=$1 unless defined $mdate;
 	    	}
 	}
-	close SVNLOG || error "svn log $file exited $?";
+	close SVNLOG || error "svn log exited $?";
 
 	if (! defined $cdate) {
-		error "failed to parse svn log for $file\n";
+		error "failed to parse svn log for $file";
 	}
 		
 	eval q{use Date::Parse};