From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Mar 2011 16:39:58 +0000 (-0400)
Subject: darcs: Fix multiple issues preventing rcs_diff from working.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7e4a0c2930afee2249ea5f3eac882460759bc2ae?hp=9d3467cf4ac8773589a90a9b28e1e726dc417e6d

darcs: Fix multiple issues preventing rcs_diff from working.
---

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index cd4fcd0ff..1313041e7 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -377,7 +377,8 @@ sub rcs_diff ($;$) {
 	my $rev=shift;
 	my $maxlines=shift;
 	my @lines;
-	foreach my $line (silentsystem("darcs", "diff", "--match", "hash ".$rev)) {
+	my $repodir=$config{srcdir};
+	foreach my $line (`darcs diff --repodir  $repodir --match 'hash $rev'`) {
 		if (@lines || $line=~/^diff/) {
 			last if defined $maxlines && @lines == $maxlines;
 			push @lines, $line."\n";
diff --git a/debian/changelog b/debian/changelog
index 49cc66936..a899e290d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20110226) UNRELEASED; urgency=low
 
   * comment: Don't show comments of subpages on parent pages.
     (Fixes bug introduced in version 3.20100505.)
+  * darcs: Fix multiple issues preventing rcs_diff from working.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Feb 2011 18:14:05 -0400