X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f389b08a0c8952494ff95f70c26783d3c3584cf9..246fa318ac5c113ca929b107a378a7b86af53e86:/IkiWiki/Rcs/svn.pm?ds=sidebyside diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index 560eb38a3..b5f5fb445 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -7,7 +7,7 @@ use IkiWiki; package IkiWiki; -my $svn_webcommit=qr/^web commit by (\w+):?(.*)/; +my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/; sub svn_info ($$) { #{{{ my $field=shift; @@ -143,8 +143,8 @@ sub rcs_recentchanges ($) { #{{{ my $committype="web"; if (defined $message[0] && $message[0]->{line}=~/$svn_webcommit/) { - $user="$1"; - $message[0]->{line}=$2; + $user=defined $2 ? "$2" : "$3"; + $message[0]->{line}=$4; } else { $committype="svn"; @@ -185,8 +185,8 @@ sub rcs_notify () { #{{{ chomp $user; my $message=`svnlook log $config{svnrepo} -r $rev`; if ($message=~/$svn_webcommit/) { - $user="$1"; - $message=$2; + $user=defined $2 ? "$2" : "$3"; + $message=$4; } my @changed_pages;