On some systems the commit message gets quoted properly already. Don't

[ikiwiki.git] / IkiWiki / Plugin / cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index c09e4f9aa7df4f5cd650aca94b8a419b05c89939..849302df46c80333a1e0d1863d6a8a2dffc33c32 100644 (file)
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -103,15 +103,11 @@ sub cvs_runcvs(@) {
        my ($cmd) = @_;
        unshift @$cmd, 'cvs', '-Q';
 
-       eval q{
-               use IPC::Cmd;
-       };
+       eval q{use IPC::Cmd};
        error($@) if $@;
 
        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) {
@@ -123,13 +119,21 @@ sub cvs_runcvs(@) {
 
 sub cvs_shquote_commit ($) {
        my $message = shift;
+       my $test_message = "CVS autodiscover quoting CVS";
 
-       eval q{
-               use String::ShellQuote;
-       };
+       eval q{use String::ShellQuote};
+       error($@) if $@;
+       eval q{use IPC::Cmd};
        error($@) if $@;
 
-       return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+       my $cmd = ['echo', shell_quote($test_message)];
+       my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
+               IPC::Cmd::run(command => $cmd, verbose => 0);
+       if ((grep /'$test_message'/, @$stdout_buf) > 0) {
+               return IkiWiki::possibly_foolish_untaint($message);
+       } else {
+               return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+       }
 }
 
 sub cvs_is_controlling {
@@ -223,14 +227,30 @@ sub rcs_add ($) {
        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");
+               }
        }
 }
 
@@ -266,18 +286,31 @@ sub rcs_recentchanges($) {
 
        return unless cvs_is_controlling;
 
-       eval q{
-               use Date::Parse;
-       };
+       eval q{use Date::Parse};
        error($@) if $@;
 
        chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-       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 $@;
 
-       while (my $line = shift @spsvc) {
+       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";
+       }
+
+       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);
@@ -297,7 +330,7 @@ sub rcs_recentchanges($) {
                #       @pages (and revisions)
                #
 
-               while ($line = shift @spsvc) {
+               while ($line = <SPSVC>) {
                        last if ($line =~ /^Members:/);
                        for ($line) {
                                s/^\s+//;
@@ -317,7 +350,7 @@ sub rcs_recentchanges($) {
                        } if length $page;
                }
 
-               while ($line = shift @spsvc) {
+               while ($line = <SPSVC>) {
                        last if ($line =~ /^Log:$/);
                        chomp $line;
                        unshift @message, { line => $line };
@@ -331,31 +364,31 @@ sub rcs_recentchanges($) {
                        $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,
@@ -365,9 +398,11 @@ sub rcs_recentchanges($) {
                        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;
 }