headers

[git.ikiwiki.info.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 9cd795e314ff758d798c86cdcd38113bec07eeed..1dbc006c11f5372eb566e639a9fd3f3f52706246 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -3,7 +3,6 @@
 use warnings;
 use strict;
 use IkiWiki;
-use POSIX qw(setlocale LC_CTYPE);
 
 package IkiWiki;
 
@@ -38,10 +37,19 @@ sub rcs_prepedit ($) { #{{{
        }
 } #}}}
 
-sub rcs_commit ($$$) { #{{{
+sub rcs_commit ($$$;$$) { #{{{
        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}/{arch}") {
                # Check to see if the page has been changed by someone
@@ -164,7 +172,6 @@ sub rcs_notify () { #{{{
        my $head = Mail::Header->new(\*LOG);
        close(LOG);
 
-       my $message = $head->get("Summary");
        my $user = $head->get("Creator");
 
        my $newfiles = $head->get("New-files");
@@ -174,57 +181,27 @@ sub rcs_notify () { #{{{
        my @changed_pages = grep { !/(^.*\/)?\.arch-ids\/.*\.id$/ }
                split(/ /, "$newfiles $modfiles $remfiles .arch-ids/fake.id");
 
-       if ($message =~ /$config{web_commit_regexp}/) {
-               $user=defined $2 ? "$2" : "$3";
-               $message=$4;
-       }
-
        require IkiWiki::UserInfo;
-       my @email_recipients=commit_notify_list($user, @changed_pages);
-       if (@email_recipients) {
-               # TODO: if a commit spans multiple pages, this will send
-               # subscribers a diff that might contain pages they did not
-               # sign up for. Should separate the diff per page and
-               # reassemble into one mail with just the pages subscribed to.
-               my $logs = `tla logs -d $config{srcdir}`;
-               my @changesets = reverse split(/\n/, $logs);
-               my $i;
-
-               for($i=0;$i<$#changesets;$i++) {
-                       last if $changesets[$i] eq $rev;
-               }
-
-               my $revminusone = $changesets[$i+1];
-               my $diff=`tla diff -d $ENV{ARCH_TREE_ROOT} $revminusone`;
-
-               my $subject="update of $config{wikiname}'s ";
-               if (@changed_pages > 2) {
-                       $subject.="$changed_pages[0] $changed_pages[1] etc";
-               }
-               else {
-                       $subject.=join(" ", @changed_pages);
-               }
-               $subject.=" by $user";
-
-               my $template=template("notifymail.tmpl");
-               $template->param(
-                       wikiname => $config{wikiname},
-                       diff => $diff,
-                       user => $user,
-                       message => $message,
-               );
-
-               eval q{use Mail::Sendmail};
-               error($@) if $@;
-               foreach my $email (@email_recipients) {
-                       sendmail(
-                               To => $email,
-                               From => "$config{wikiname} <$config{adminemail}>",
-                               Subject => $subject,
-                               Message => $template->output,
-                       ) or error("Failed to send update notification mail");
-               }
-       }
+       send_commit_mails(
+               sub {
+                       my $message = $head->get("Summary");
+                       if ($message =~ /$config{web_commit_regexp}/) {
+                               $user=defined $2 ? "$2" : "$3";
+                               $message=$4;
+                       }
+               },
+               sub {
+                       my $logs = `tla logs -d $config{srcdir}`;
+                       my @changesets = reverse split(/\n/, $logs);
+                       my $i;
+
+                       for($i=0;$i<$#changesets;$i++) {
+                               last if $changesets[$i] eq $rev;
+                       }
+       
+                       my $revminusone = $changesets[$i+1];
+                       `tla diff -d $ENV{ARCH_TREE_ROOT} $revminusone`;
+               }, $user, @changed_pages);
 } #}}}
 
 sub rcs_getctime ($) { #{{{