summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-03-02 12:39:58 -0400
committerJoey Hess <joey@kitenet.net>2011-03-02 12:39:58 -0400
commit7e4a0c2930afee2249ea5f3eac882460759bc2ae (patch)
tree02dfd243866c9921a681244516767f8f21f2b179
parent9d3467cf4ac8773589a90a9b28e1e726dc417e6d (diff)
darcs: Fix multiple issues preventing rcs_diff from working.
-rw-r--r--IkiWiki/Plugin/darcs.pm3
-rw-r--r--debian/changelog1
2 files changed, 3 insertions, 1 deletions
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