X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c430792148b2193585dfed6cc2a5f778f7167de1..9c0f98de02f550081d8bb8bf18cf12db92bec6cd:/IkiWiki/Plugin/recentchanges.pm

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 88100af0f..562f61d40 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -87,9 +87,11 @@ sub sessioncgi ($$) {
 		action => $config{cgiurl},
 		stylesheet => 1,
 		template => { template('revert.tmpl') },
+		fields => [qw{revertmessage do sid rev}],
 	);
 	my $buttons=["Revert", "Cancel"];
 
+	$form->field(name => "revertmessage", type => "text", size => 80);
 	$form->field(name => "sid", type => "hidden", value => $session->id,
 		force => 1);
 	$form->field(name => "do", type => "hidden", value => "revert",
@@ -99,25 +101,23 @@ sub sessioncgi ($$) {
 
 	if ($form->submitted eq 'Revert' && $form->validate) {
 		IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
-		IkiWiki::disable_commit_hook();
-		my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
-		if (! defined $r) { # success
-			rcs_commit_staged(
-				message => sprintf(gettext("This reverts commit %s"), $rev),
-				session => $session,
-				rev => $rev,
-			);
+		my $message=sprintf(gettext("This reverts commit %s"), $rev);
+		if (defined $form->field('revertmessage') &&
+		    length $form->field('revertmessage')) {
+			$message=$form->field('revertmessage')."\n\n".$message;
 		}
+		my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
+		error $r if defined $r;
+		IkiWiki::disable_commit_hook();
+		IkiWiki::rcs_commit_staged(
+			message => $message,
+			session => $session,
+		);
 		IkiWiki::enable_commit_hook();
 	
-		if (defined $r) {
-			die "Revert '$rev' failed.";
-		}
-		else {
-			require IkiWiki::Render;
-			IkiWiki::refresh();
-			IkiWiki::saveindex();
-		}
+		require IkiWiki::Render;
+		IkiWiki::refresh();
+		IkiWiki::saveindex();
 	}
 	elsif ($form->submitted ne 'Cancel') {
 	        $form->title(sprintf(gettext("confirm reversion of %s"), $rev));