cosmetics patch from Recai

[ikiwiki.git] / IkiWiki / Rcs / svn.pm

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index ee5065379d24eb15e078eea9ce0ee3d029a8d9a3..597295d44c44220a7a66999767d961d854e5cfec 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -60,13 +60,22 @@ 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.
        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
@@ -201,6 +210,12 @@ sub rcs_notify () { #{{{
        
        my $user=`svnlook author $config{svnrepo} -r $rev`;
        chomp $user;
+       
+       my $message=`svnlook log $config{svnrepo} -r $rev`;
+       if ($message=~/$config{web_commit_regexp}/) {
+               $user=defined $2 ? "$2" : "$3";
+               $message=$4;
+       }
 
        my @changed_pages;
        foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
@@ -213,11 +228,6 @@ sub rcs_notify () { #{{{
        require IkiWiki::UserInfo;
        send_commit_mails(
                sub {
-                       my $message=`svnlook log $config{svnrepo} -r $rev`;
-                       if ($message=~/$config{web_commit_regexp}/) {
-                               $user=defined $2 ? "$2" : "$3";
-                               $message=$4;
-                       }
                        return $message;
                },
                sub {