summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/darcs.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/darcs.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/darcs.pm')
-rw-r--r--IkiWiki/Plugin/darcs.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index f17fadcb1..345456c01 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -140,11 +140,11 @@ sub rcs_prepedit ($) {
return $rev;
}
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
# Commit the page. Returns 'undef' on success and a version of the page
# with conflict markers on failure.
- my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+ my ($file, $message, $rcstoken, $user, $ipaddr, $emailuser) = @_;
# Compute if the "revision" of $file changed.
my $changed = darcs_rev($file) ne $rcstoken;
@@ -239,8 +239,8 @@ sub rcs_commit ($$$;$$) {
}
}
-sub rcs_commit_staged ($$$) {
- my ($message, $user, $ipaddr) = @_;
+sub rcs_commit_staged ($$$;$) {
+ my ($message, $user, $ipaddr, $emailuser) = @_;
my $author;
if (defined $user) {