From 7e9ca590c745ad01f7d0beb44bbe24eea35f531d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 8 Oct 2010 19:19:43 -0400
Subject: [PATCH] add message field to revert form

---
 IkiWiki/Plugin/recentchanges.pm | 9 ++++++++-
 templates/revert.tmpl           | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index b7c014e90..c57b6749a 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,11 +101,16 @@ sub sessioncgi ($$) {
 
 	if ($form->submitted eq 'Revert' && $form->validate) {
 		IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
+		my $message=sprintf(gettext("This reverts commit %s"), $rev);
+		if (defined $form->field('revertmessage') &&
+		    length $form->field('revertmessage')) {
+			$message=$form->field('revertmessage')."\n".$message;
+		}
 		my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
 		error $r if defined $r;
 		IkiWiki::disable_commit_hook();
 		rcs_commit_staged(
-			message => sprintf(gettext("This reverts commit %s"), $rev),
+			message => $message,
 			session => $session,
 		);
 		IkiWiki::enable_commit_hook();
diff --git a/templates/revert.tmpl b/templates/revert.tmpl
index 6289bea6b..0de32811b 100644
--- a/templates/revert.tmpl
+++ b/templates/revert.tmpl
@@ -3,6 +3,8 @@
  <TMPL_VAR FIELD-DO>
  <TMPL_VAR FIELD-SID>
  <TMPL_VAR FIELD-REV>
+<label for="revertmessage" class="block">Optional comment about this change:</label>
+ <TMPL_VAR FIELD-REVERTMESSAGE>
 </div>
 <div class="revert buttons">
 <TMPL_VAR form-submit>