* Match 'web commit from' in SVN and git, these are web commits too.

  (Faidon)

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 6cbcfd14e925ae45e40bcba12b0b3f24b1a93653..271c27af658e217611adbd804c277b31745ccf11 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -12,7 +12,7 @@ my $origin_branch    = 'origin';            # Git ref for main repository
 my $master_branch    = 'master';            # working branch
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
-my $web_commit_msg   = qr/^web commit by (\w+):?(.*)/; # pattern for web commits
+my $web_commit_msg   = qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
 
 sub _safe_git (&@) { #{{{
        # Start a child process safely without resorting /bin/sh.
@@ -377,8 +377,8 @@ sub rcs_recentchanges ($) { #{{{
 
                if (defined $message[0] &&
                    $message[0]->{line} =~ m/$web_commit_msg/) {
-                       $user = "$1";
-                       $message[0]->{line} = $2;
+                       $user=defined $2 ? "$2" : "$3";
+                       $message[0]->{line}=$4;
                } else {
                        $type ="git";
                        $user = $ci->{'author_username'};
@@ -426,8 +426,8 @@ sub rcs_notify () { #{{{
 
        my ($user, $message);
        if (@{ $ci->{'comment'} }[0] =~ m/$web_commit_msg/) {
-               $user    = "$1";
-               $message = $2;
+               $user    = defined $2 ? "$2" : "$3";
+               $message = $4;
        } else {
                $user    = $ci->{'author_username'};
                $message = join "\n", @{ $ci->{'comment'} };

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index 560eb38a326941a642a40bf1019cce10aa469823..b5f5fb445832d65e4115831fc885823ceb687a5d 100644 (file)
--- 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;

diff --git a/debian/changelog b/debian/changelog
index 5c77798bd47a71dee5271dec66a12094e49c7f77..8dd0996efcb7d270155e73c9636f24ab2d06ce51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,10 @@ ikiwiki (1.9) UNRELEASED; urgency=low
   * Fix from Faidon for a XML parser issue that breaks utf-8 for
     RecentChanges. Avoid using XML::SAX::PurePerl, which is buggy in this
     area, and also way slow.
+  * Match 'web commit from' in SVN and git, these are web commits too.
+    (Faidon)
 
- -- Joey Hess <joeyh@debian.org>  Tue, 11 Jul 2006 14:37:30 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 11 Jul 2006 16:54:00 -0400
 
 ikiwiki (1.8) unstable; urgency=low
 

diff --git a/doc/patchqueue/webcommit-from.mdwn b/doc/patchqueue/webcommit-from.mdwn
index 9855c5ce98b064051deb4a49bd275b18261b3b6a..ea13c4b445b22768fb23335a8818c94ca6cd442d 100644 (file)
--- a/doc/patchqueue/webcommit-from.mdwn
+++ b/doc/patchqueue/webcommit-from.mdwn
@@ -1,3 +1,5 @@
+Looks good, [[patchqueue/done]] -- [[Joey]]
+
 From [[Faidon]]:
        
 Match 'web commit from' in SVN and git, these are web