diff options
author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-11 20:55:14 +0000 |
---|---|---|
committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-11 20:55:14 +0000 |
commit | afedd60d7911b35aa3fb86dad24d61809946b9ed (patch) | |
tree | 3d0daa13b6f004e8a57dd5585e7174f2a8df34c5 /IkiWiki/Rcs/svn.pm | |
parent | c4e222f59103107041ddcb778cc153eaf8ca492b (diff) | |
download | ikiwiki-afedd60d7911b35aa3fb86dad24d61809946b9ed.tar ikiwiki-afedd60d7911b35aa3fb86dad24d61809946b9ed.tar.gz |
* Match 'web commit from' in SVN and git, these are web commits too.
(Faidon)
Diffstat (limited to 'IkiWiki/Rcs/svn.pm')
-rw-r--r-- | IkiWiki/Rcs/svn.pm | 10 |
1 files changed, 5 insertions, 5 deletions
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; |