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

minor formatting

master
Joey Hess 2009-09-02 16:08:18 -04:00
parent 9f5cc7c9a2
commit de7c3aa16b
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IkiWiki/Plugin/cvs.pm
View File

@ -61,7 +61,7 @@ sub getsetup () {
cvs_wrapper => { cvs_wrapper => {
type => "string", type => "string",
example => "/cvs/wikirepo/CVSROOT/post-commit", example => "/cvs/wikirepo/CVSROOT/post-commit",
description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry", description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry)",
safe => 0, # file safe => 0, # file
rebuild => 0, rebuild => 0,
}, },
@ -131,7 +131,8 @@ sub cvs_shquote_commit ($) {
IPC::Cmd::run(command => $cmd, verbose => 0); IPC::Cmd::run(command => $cmd, verbose => 0);
if ((grep /'$test_message'/, @$stdout_buf) > 0) { if ((grep /'$test_message'/, @$stdout_buf) > 0) {
return IkiWiki::possibly_foolish_untaint($message); return IkiWiki::possibly_foolish_untaint($message);
} else { }
else {
return shell_quote(IkiWiki::possibly_foolish_untaint($message)); return shell_quote(IkiWiki::possibly_foolish_untaint($message));
} }
} }
@ -242,11 +243,13 @@ sub rcs_add ($) {
if (defined($filemime) && $filemime eq 'text/plain') { if (defined($filemime) && $filemime eq 'text/plain') {
cvs_runcvs(['add', $file]) || cvs_runcvs(['add', $file]) ||
warn("cvs add $file failed\n"); warn("cvs add $file failed\n");
} else { }
else {
cvs_runcvs(['add', '-kb', $file]) || cvs_runcvs(['add', '-kb', $file]) ||
warn("cvs add binary $file failed\n"); warn("cvs add binary $file failed\n");
} }
} else { }
else {
# directory # directory
cvs_runcvs(['add', $file]) || cvs_runcvs(['add', $file]) ||
warn("cvs add $file failed\n"); warn("cvs add $file failed\n");
@ -360,7 +363,8 @@ sub rcs_recentchanges($) {
$message[0]->{line}=~/$config{web_commit_regexp}/) { $message[0]->{line}=~/$config{web_commit_regexp}/) {
$user=defined $2 ? "$2" : "$3"; $user=defined $2 ? "$2" : "$3";
$message[0]->{line}=$4; $message[0]->{line}=$4;
} else { }
else {
$committype="cvs"; $committype="cvs";
} }
@ -370,21 +374,24 @@ sub rcs_recentchanges($) {
$line = <SPSVC>; $line = <SPSVC>;
if ($line =~ /^Author: (.*)$/) { if ($line =~ /^Author: (.*)$/) {
$user = $1 unless defined $user && length $user; $user = $1 unless defined $user && length $user;
} else { }
else {
error "expected Author, got $line"; error "expected Author, got $line";
} }
$line = <SPSVC>; $line = <SPSVC>;
if ($line =~ /^Date: (.*)$/) { if ($line =~ /^Date: (.*)$/) {
$when = str2time($1, 'UTC'); $when = str2time($1, 'UTC');
} else { }
else {
error "expected Date, got $line"; error "expected Date, got $line";
} }
$line = <SPSVC>; $line = <SPSVC>;
if ($line =~ /^PatchSet (.*)$/) { if ($line =~ /^PatchSet (.*)$/) {
$rev = $1; $rev = $1;
} else { }
else {
error "expected PatchSet, got $line"; error "expected PatchSet, got $line";
} }
@ -422,7 +429,8 @@ sub rcs_diff ($) {
if (wantarray) { if (wantarray) {
return @cvsps; return @cvsps;
} else { }
else {
return join("", @cvsps); return join("", @cvsps);
} }
} }