X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/35ee7e44a62f9126a83c1243b549d47cc5ca7b43..6d721c05a75d211a46f427ba0605439a4023affb:/IkiWiki/Rcs/svn.pm?ds=sidebyside diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index 2d3ad046c..f4c8e92c6 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -7,8 +7,6 @@ use POSIX qw(setlocale LC_CTYPE); 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()); @@ -162,7 +160,7 @@ sub rcs_recentchanges ($) { #{{{ 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; } @@ -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`; - if ($message=~/$svn_webcommit/) { + if ($message=~/$config{web_commit_regexp}/) { $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`; - 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"; }