urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darcs: Fix multiple issues preventing rcs_diff from working.

master
Joey Hess 2011-03-02 12:39:58 -04:00
parent 9d3467cf4a
commit 7e4a0c2930
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Plugin/darcs.pm
View File

@ -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";

1
debian/changelog vendored
View File

@ -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