}
sub cvs_runcvs(@) {
- my ($cmd) = @_;
- unshift @$cmd, 'cvs', '-Q';
-
- eval q{use IPC::Cmd};
- error($@) if $@;
+ my @cmd = @_;
+ unshift @cmd, 'cvs', '-Q';
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
- debug("runcvs: " . join(" ", @$cmd));
-
- my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
- IPC::Cmd::run(command => $cmd, verbose => 0);
- if (! $success) {
- warn(join(" ", @$cmd) . " exited with code $error_code\n");
- warn(join "", @$stderr_buf);
- }
- return $success;
-}
-
-sub cvs_shquote_commit ($) {
- my $message = shift;
-
- eval q{use String::ShellQuote};
- error($@) if $@;
+ open(my $savedout, ">&STDOUT");
+ open(STDOUT, ">", "/dev/null");
+ my $ret = system(@cmd);
+ open(STDOUT, ">&", $savedout);
- return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+ return ($ret == 0) ? 1 : 0;
}
sub cvs_is_controlling {
sub rcs_update () {
return unless cvs_is_controlling;
- cvs_runcvs(['update', '-dP']);
+ cvs_runcvs('update', '-dP');
}
sub rcs_prepedit ($) {
if (defined $rev && defined $oldrev && $rev != $oldrev) {
# Merge their changes into the file that we've
# changed.
- cvs_runcvs(['update', $file]) ||
+ cvs_runcvs('update', $file) ||
warn("cvs merge from $oldrev to $rev failed\n");
}
- if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+ if (! cvs_runcvs('commit', '-m',
+ IkiWiki::possibly_foolish_untaint $message)) {
my $conflict=readfile("$config{srcdir}/$file");
- cvs_runcvs(['update', '-C', $file]) ||
+ cvs_runcvs('update', '-C', $file) ||
warn("cvs revert failed\n");
return $conflict;
}
$message="web commit from $ipaddr".(length $message ? ": $message" : "");
}
- if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+ if (! cvs_runcvs('commit', '-m',
+ IkiWiki::possibly_foolish_untaint $message)) {
warn "cvs staged commit failed\n";
return 1; # failure
}
my $parent=IkiWiki::dirname($file);
my @files_to_add = ($file);
+ eval q{use File::MimeInfo};
+ error($@) if $@;
+
until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
push @files_to_add, $parent;
$parent = IkiWiki::dirname($parent);
}
while ($file = pop @files_to_add) {
- cvs_runcvs(['add', $file]) ||
- warn("cvs add $file failed\n");
+ if (@files_to_add == 0) {
+ # file
+ my $filemime = File::MimeInfo::default($file);
+ if (defined($filemime) && $filemime eq 'text/plain') {
+ cvs_runcvs('add', $file) ||
+ warn("cvs add $file failed\n");
+ } else {
+ cvs_runcvs('add', '-kb', $file) ||
+ warn("cvs add binary $file failed\n");
+ }
+ } else {
+ # directory
+ cvs_runcvs('add', $file) ||
+ warn("cvs add $file failed\n");
+ }
}
}
return unless cvs_is_controlling;
- cvs_runcvs(['rm', '-f', $file]) ||
+ cvs_runcvs('rm', '-f', $file) ||
warn("cvs rm $file failed\n");
}
chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
- # there's no option to get the last N changesets, so read backwards
- open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
- my @spsvc = reverse <CVSPS>; # is this great? no it is not
- close CVSPS || error "couldn't close cvsps output: $!\n";
+ # There's no cvsps option to get the last N changesets.
+ # Write full output to a temp file and read backwards.
+
+ eval q{use File::Temp qw/tempfile/};
+ error($@) if $@;
+ eval q{use File::ReadBackwards};
+ error($@) if $@;
+
+ my (undef, $tmpfile) = tempfile(OPEN=>0);
+ system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
+ if ($? == -1) {
+ error "couldn't run cvsps: $!\n";
+ } elsif (($? >> 8) != 0) {
+ error "cvsps exited " . ($? >> 8) . ": $!\n";
+ }
- while (my $line = shift @spsvc) {
+ tie(*SPSVC, 'File::ReadBackwards', $tmpfile)
+ || error "couldn't open $tmpfile for read: $!\n";
+
+ while (my $line = <SPSVC>) {
$line =~ /^$/ || error "expected blank line, got $line";
my ($rev, $user, $committype, $when);
# @pages (and revisions)
#
- while ($line = shift @spsvc) {
+ while ($line = <SPSVC>) {
last if ($line =~ /^Members:/);
for ($line) {
s/^\s+//;
} if length $page;
}
- while ($line = shift @spsvc) {
+ while ($line = <SPSVC>) {
last if ($line =~ /^Log:$/);
chomp $line;
unshift @message, { line => $line };
$committype="cvs";
}
- $line = shift @spsvc; # Tag
- $line = shift @spsvc; # Branch
+ $line = <SPSVC>; # Tag
+ $line = <SPSVC>; # Branch
- $line = shift @spsvc;
+ $line = <SPSVC>;
if ($line =~ /^Author: (.*)$/) {
$user = $1 unless defined $user && length $user;
} else {
error "expected Author, got $line";
}
- $line = shift @spsvc;
+ $line = <SPSVC>;
if ($line =~ /^Date: (.*)$/) {
$when = str2time($1, 'UTC');
} else {
error "expected Date, got $line";
}
- $line = shift @spsvc;
+ $line = <SPSVC>;
if ($line =~ /^PatchSet (.*)$/) {
$rev = $1;
} else {
error "expected PatchSet, got $line";
}
- $line = shift @spsvc; # ---------------------
+ $line = <SPSVC>; # ---------------------
push @ret, {
rev => $rev,
message => [@message],
pages => [@pages],
} if @pages;
- return @ret if @ret >= $num;
+ last if @ret >= $num;
}
+ unlink($tmpfile) || error "couldn't unlink $tmpfile: $!\n";
+
return @ret;
}