web commit by JoshTriplett: Add "deblist" shortcut; [[deblist devel]] links to http...

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

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 2d3ad046caf95c171bbc0d1d2b56b0eeee738b42..f4c8e92c642cc240a958e80d07c3406987dbd4f5 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -7,8 +7,6 @@ use POSIX qw(setlocale LC_CTYPE);
 
 package IkiWiki;
                
 
 package IkiWiki;
                

-my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
-

 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
        my $current = setlocale(LC_CTYPE());
 # svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do.
 sub find_lc_ctype() {
        my $current = setlocale(LC_CTYPE());


@@ -162,7 +160,7 @@ sub rcs_recentchanges ($) { #{{{
 
                my $committype="web";
                if (defined $message[0] &&
 
                my $committype="web";
                if (defined $message[0] &&

-                   $message[0]->{line}=~/$svn_webcommit/) {
+                   $message[0]->{line}=~/$config{web_commit_regexp}/) {

                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
                }
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
                }


@@ -204,7 +202,7 @@ sub rcs_notify () { #{{{
        my $user=`svnlook author $config{svnrepo} -r $rev`;
        chomp $user;
        my $message=`svnlook log $config{svnrepo} -r $rev`;
        my $user=`svnlook author $config{svnrepo} -r $rev`;
        chomp $user;
        my $message=`svnlook log $config{svnrepo} -r $rev`;

-       if ($message=~/$svn_webcommit/) {
+       if ($message=~/$config{web_commit_regexp}/) {

                $user=defined $2 ? "$2" : "$3";
                $message=$4;
        }
                $user=defined $2 ? "$2" : "$3";
                $message=$4;
        }


@@ -226,7 +224,7 @@ sub rcs_notify () { #{{{
                # reassemble into one mail with just the pages subscribed to.
                my $diff=`svnlook diff $config{svnrepo} -r $rev --no-diff-deleted`;
 
                # reassemble into one mail with just the pages subscribed to.
                my $diff=`svnlook diff $config{svnrepo} -r $rev --no-diff-deleted`;
 

-               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";
                }
                if (@changed_pages > 2) {
                        $subject.="$changed_pages[0] $changed_pages[1] etc";
                }