diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/darcs.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 7d1f5c401..9de25a4b3 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1168,7 +1168,7 @@ sub urlto ($;$$) { } if (! defined $from) { - my $u = $local_url; + my $u = $local_url || ''; $u =~ s{/$}{}; return $u.beautify_urlpath("/".$to); } 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 |