summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/svn.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-06-23 16:05:49 -0400
committerJoey Hess <joey@kitenet.net>2010-06-23 16:05:49 -0400
commitb4a43406f61b7ff9ab77d242edf4d59369ac8596 (patch)
treeca0d33b7d0e22a19f9fb1610df1f7238bcd2ec3d /IkiWiki/Plugin/svn.pm
parentc46bcb425af0948ac59581d6ba7b477826d83ae3 (diff)
API: rcs_commit and rcs_commit_staged are passed a new parameter
that may contain the username component of the email address of the user making the commit.
Diffstat (limited to 'IkiWiki/Plugin/svn.pm')
-rw-r--r--IkiWiki/Plugin/svn.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index d10b4888d..ffacb8cf9 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,7 +144,7 @@ sub rcs_prepedit ($) {
}
}
-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.
@@ -153,6 +153,7 @@ sub rcs_commit ($$$;$$) {
my $rcstoken=shift;
my $user=shift;
my $ipaddr=shift;
+ my $emailuser=shift;
if (defined $user) {
$message="web commit by $user".(length $message ? ": $message" : "");
@@ -189,10 +190,10 @@ sub rcs_commit ($$$;$$) {
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)=@_;
+ my ($message, $user, $ipaddr, $emailuser)=@_;
if (defined $user) {
$message="web commit by $user".(length $message ? ": $message" : "");