urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(Faidon)
master
joey 2006-07-11 20:55:14 +00:00
parent c4e222f591
commit afedd60d79
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Rcs/git.pm
View File

@ -12,7 +12,7 @@ my $origin_branch = 'origin'; # Git ref for main repository
my $master_branch = 'master'; # working branch my $master_branch = 'master'; # working branch
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums 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 $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 (&@) { #{{{ sub _safe_git (&@) { #{{{
# Start a child process safely without resorting /bin/sh. # Start a child process safely without resorting /bin/sh.
@ -377,8 +377,8 @@ sub rcs_recentchanges ($) { #{{{
if (defined $message[0] && if (defined $message[0] &&
$message[0]->{line} =~ m/$web_commit_msg/) { $message[0]->{line} =~ m/$web_commit_msg/) {
$user = "$1"; $user=defined $2 ? "$2" : "$3";
$message[0]->{line} = $2; $message[0]->{line}=$4;
} else { } else {
$type ="git"; $type ="git";
$user = $ci->{'author_username'}; $user = $ci->{'author_username'};
@ -426,8 +426,8 @@ sub rcs_notify () { #{{{
my ($user, $message); my ($user, $message);
if (@{ $ci->{'comment'} }[0] =~ m/$web_commit_msg/) { if (@{ $ci->{'comment'} }[0] =~ m/$web_commit_msg/) {
$user = "$1"; $user = defined $2 ? "$2" : "$3";
$message = $2; $message = $4;
} else { } else {
$user = $ci->{'author_username'}; $user = $ci->{'author_username'};
$message = join "\n", @{ $ci->{'comment'} }; $message = join "\n", @{ $ci->{'comment'} };

10
IkiWiki/Rcs/svn.pm
View File

@ -7,7 +7,7 @@ use IkiWiki;
package 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 ($$) { #{{{ sub svn_info ($$) { #{{{
my $field=shift; my $field=shift;
@ -143,8 +143,8 @@ sub rcs_recentchanges ($) { #{{{
my $committype="web"; my $committype="web";
if (defined $message[0] && if (defined $message[0] &&
$message[0]->{line}=~/$svn_webcommit/) { $message[0]->{line}=~/$svn_webcommit/) {
$user="$1"; $user=defined $2 ? "$2" : "$3";
$message[0]->{line}=$2; $message[0]->{line}=$4;
} }
else { else {
$committype="svn"; $committype="svn";
@ -185,8 +185,8 @@ sub rcs_notify () { #{{{
chomp $user; chomp $user;
my $message=`svnlook log $config{svnrepo} -r $rev`; my $message=`svnlook log $config{svnrepo} -r $rev`;
if ($message=~/$svn_webcommit/) { if ($message=~/$svn_webcommit/) {
$user="$1"; $user=defined $2 ? "$2" : "$3";
$message=$2; $message=$4;
} }
my @changed_pages; my @changed_pages;

4
debian/changelog vendored
View File

@ -12,8 +12,10 @@ ikiwiki (1.9) UNRELEASED; urgency=low
* Fix from Faidon for a XML parser issue that breaks utf-8 for * Fix from Faidon for a XML parser issue that breaks utf-8 for
RecentChanges. Avoid using XML::SAX::PurePerl, which is buggy in this RecentChanges. Avoid using XML::SAX::PurePerl, which is buggy in this
area, and also way slow. 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 ikiwiki (1.8) unstable; urgency=low

2
doc/patchqueue/webcommit-from.mdwn
View File

@ -1,3 +1,5 @@
Looks good, [[patchqueue/done]] -- [[Joey]]
From [[Faidon]]: From [[Faidon]]:
Match 'web commit from' in SVN and git, these are web Match 'web commit from' in SVN and git, these are web