darcs: Fix multiple issues preventing rcs_diff from working.

diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index cd4fcd0fff438b250e7dd059d0e8eaa05be95bcf..1313041e78fe9c61588c04a53bae58e4e22d33d5 100644 (file)
--- 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;
        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";
                if (@lines || $line=~/^diff/) {
                        last if defined $maxlines && @lines == $maxlines;
                        push @lines, $line."\n";

diff --git a/debian/changelog b/debian/changelog
index 49cc669369e8d2f44688398b6bf4673f3d9e1314..a899e290dccd68ac1a5c6c37992e05ff139eba3f 100644 (file)
--- 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.)
 
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 27 Feb 2011 18:14:05 -0400