From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sat, 2 Feb 2013 19:11:15 +0000 (-0500)
Subject: Fix diffurl links (cvsweb expects unescaped '/').
X-Git-Tag: 3.20130212~7^2~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/91b477c08789142667aad8e3c737e9b9a4d4ce64

Fix diffurl links (cvsweb expects unescaped '/').
---

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index bccab3159..841aec914 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -314,7 +314,9 @@ sub rcs_recentchanges ($) {
 			$oldrev =~ s/INITIAL/0/;
 			$newrev =~ s/\(DEAD\)//;
 			my $diffurl = defined $config{diffurl} ? $config{diffurl} : "";
-			my $epage = uri_escape_utf8($page);
+			my $epage = join('/',
+				map { uri_escape_utf8($_) } split('/', $page)
+			);
 			$diffurl=~s/\[\[file\]\]/$epage/g;
 			$diffurl=~s/\[\[r1\]\]/$oldrev/g;
 			$diffurl=~s/\[\[r2\]\]/$newrev/g;
diff --git a/t/cvs.t b/t/cvs.t
index d9b9ec48e..17598f7f7 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -388,6 +388,12 @@ sub test_rcs_diff {
 	@changes = IkiWiki::rcs_recentchanges(3);
 	is_total_number_of_changes(\@changes, 1);
 
+	unlike(
+		$changes[0]->{pages}->[0]->{diffurl},
+		qr/%2F/m,
+		q{path separators are preserved when UTF-8scaping filename},
+	);
+
 	my $changeset = 1;
 
 	my $maxlines = undef;
@@ -573,6 +579,7 @@ sub _generate_test_config {
 	$config{cvsrepo} = "$dir/repo";
 	$config{cvspath} = "ikiwiki";
 	use Cwd; $config{templatedir} = getcwd() . '/templates';
+	$config{diffurl} = "/nonexistent/cvsweb/[[file]]";
 	IkiWiki::loadplugins();
 	IkiWiki::checkconfig();
 }