From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Fri, 25 Jan 2013 13:47:17 +0000 (-0500)
Subject: Merge branch 'master' into cvs
X-Git-Tag: 3.20130212~7^2~6
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/64370885cca3a37ee1f4a9e96673aca7ba5daae4?ds=inline;hp=-c

Merge branch 'master' into cvs
---

64370885cca3a37ee1f4a9e96673aca7ba5daae4
diff --combined IkiWiki/Plugin/cvs.pm
index 42812ddef,788f51167..759ea1c23
--- a/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;
  }