Merge branch 'master' into cvs

diff --combined IkiWiki/Plugin/cvs.pm
index 42812ddefe77ae8888c0040d99d0b0ef82ed774b,788f5116786f291d1543944c55522b6a758439e7..759ea1c23b3d76672155d66b559c3cda6ed0c124
--- 1/IkiWiki/Plugin/cvs.pm
--- 2/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -33,6 -33,7 +33,7 @@@ use warnings
  use strict;
  use IkiWiki;
  
+ use URI::Escape q{uri_escape_utf8};
  use File::chdir;
  
  
@@@ -215,12 -216,14 +216,12 @@@ sub rcs_add ($) 
  
        while ($file = pop @files_to_add) {
                if (@files_to_add == 0) {
 -                      # file
                        cvs_runcvs('add', cvs_keyword_subst_args($file)) ||
 -                              warn("cvs add $file failed\n");
 +                              warn("cvs add file $file failed\n");
                }
                else {
 -                      # directory
                        cvs_runcvs('add', $file) ||
 -                              warn("cvs add $file failed\n");
 +                              warn("cvs add dir $file failed\n");
                }
        }
  }
@@@ -313,7 -316,8 +314,8 @@@ sub rcs_recentchanges ($) 
                        $oldrev =~ s/INITIAL/0/;
                        $newrev =~ s/\(DEAD\)//;
                        my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
-                       $diffurl=~s/\[\[file\]\]/$page/g;
+                       my $epage = uri_escape_utf8($page);
+                       $diffurl=~s/\[\[file\]\]/$epage/g;
                        $diffurl=~s/\[\[r1\]\]/$oldrev/g;
                        $diffurl=~s/\[\[r2\]\]/$newrev/g;
                        unshift @pages, {
@@@ -392,15 -396,11 +394,15 @@@ sub rcs_diff ($;$) 
        my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;
        my $blank_lines_seen = 0;
  
 +      # skip log, get to the diff
        while (my $line = shift @cvsps) {
                $blank_lines_seen++ if ($line =~ /^$/);
                last if $blank_lines_seen == 2;
        }
  
 +      @cvsps = @cvsps[0..$maxlines-1]
 +              if defined $maxlines && @cvsps > $maxlines;
 +
        if (wantarray) {
                return @cvsps;
        }
@@@ -491,9 -491,12 +493,9 @@@ sub cvs_keyword_subst_args ($) 
        my $filemime = File::MimeInfo::default($file);
        # if (-T $file) {
  
 -      if (defined($filemime) && $filemime eq 'text/plain') {
 -              return ($file);
 -      }
 -      else {
 -              return ('-kb', $file);
 -      }
 +      defined($filemime) && $filemime eq 'text/plain'
 +              ? return ('-kkv', $file)
 +              : return ('-kb', $file);
  }
  
  sub cvs_runcvs(@) {
@@@ -502,31 -505,10 +504,31 @@@
  
        local $CWD = $config{srcdir};
  
 -      open(my $savedout, ">&STDOUT");
 -      open(STDOUT, ">", "/dev/null");
 -      my $ret = system(@cmd);
 -      open(STDOUT, ">&", $savedout);
 +      eval q{
 +              use IPC::Open3;
 +              use Symbol qw(gensym);
 +              use IO::File;
 +      };
 +      error($@) if $@;
 +
 +      my $cvsout = '';
 +      my $cvserr = '';
 +      local *CATCHERR = IO::File->new_tmpfile;
 +      my $pid = open3(gensym(), \*CATCHOUT, ">&CATCHERR", @cmd);
 +      while (my $l = <CATCHOUT>) {
 +              $cvsout .= $l
 +                      unless 1;
 +      }
 +      waitpid($pid, 0);
 +      my $ret = $? >> 8;
 +      seek CATCHERR, 0, 0;
 +      while (my $l = <CATCHERR>) {
 +              $cvserr .= $l
 +                      unless $l =~ /^cvs commit: changing keyword expansion /;
 +      }
 +
 +      print STDOUT $cvsout;
 +      print STDERR $cvserr;
  
        return ($ret == 0) ? 1 : 0;
  }