web commit by http://choffee.myopenid.com/: Testing openid.

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

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index c71c9e6ee77907ea02afcc66e7e512323d50ce74..9cd795e314ff758d798c86cdcd38113bec07eeed 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -7,8 +7,6 @@ use POSIX qw(setlocale LC_CTYPE);
 
 package IkiWiki;
 
-my $tla_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
-
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
@@ -117,7 +115,7 @@ sub rcs_recentchanges ($) {
                my $when = time - str2time($sdate, 'UTC');
 
                my $committype = "web";
-               if (defined $summ && $summ =~ /$tla_webcommit/) {
+               if (defined $summ && $summ =~ /$config{web_commit_regexp}/) {
                        $user = defined $2 ? "$2" : "$3";
                        $summ = $4;
                }
@@ -176,7 +174,7 @@ sub rcs_notify () { #{{{
        my @changed_pages = grep { !/(^.*\/)?\.arch-ids\/.*\.id$/ }
                split(/ /, "$newfiles $modfiles $remfiles .arch-ids/fake.id");
 
-       if ($message =~ /$tla_webcommit/) {
+       if ($message =~ /$config{web_commit_regexp}/) {
                $user=defined $2 ? "$2" : "$3";
                $message=$4;
        }
@@ -199,7 +197,7 @@ sub rcs_notify () { #{{{
                my $revminusone = $changesets[$i+1];
                my $diff=`tla diff -d $ENV{ARCH_TREE_ROOT} $revminusone`;
 
-               my $subject="$config{wikiname} update of ";
+               my $subject="update of $config{wikiname}'s ";
                if (@changed_pages > 2) {
                        $subject.="$changed_pages[0] $changed_pages[1] etc";
                }