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

* Correct a pair of logic errors that triggered if svnpath was empty.

master
joey 2007-10-21 22:57:11 +00:00
parent b75e57f126
commit 19cfec2654
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IkiWiki/Rcs/svn.pm
View File

@ -187,14 +187,17 @@ sub rcs_recentchanges ($) { #{{{
$committype="svn"; $committype="svn";
} }
foreach (keys %{$logentry->{paths}}) { foreach my $file (keys %{$logentry->{paths}}) {
next unless ! length $config{svnpath} || if (length $config{svnpath}) {
/^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/; next unless $file=~/^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
my $file=$1; $file=$1;
}
my $diffurl=$config{diffurl}; my $diffurl=$config{diffurl};
$diffurl=~s/\[\[file\]\]/$file/g; $diffurl=~s/\[\[file\]\]/$file/g;
$diffurl=~s/\[\[r1\]\]/$rev - 1/eg; $diffurl=~s/\[\[r1\]\]/$rev - 1/eg;
$diffurl=~s/\[\[r2\]\]/$rev/g; $diffurl=~s/\[\[r2\]\]/$rev/g;
push @pages, { push @pages, {
page => pagename($file), page => pagename($file),
diffurl => $diffurl, diffurl => $diffurl,
@ -231,9 +234,13 @@ sub rcs_notify () { #{{{
my @changed_pages; my @changed_pages;
foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) { foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
chomp $change; chomp $change;
if (! length $config{svnpath} || if (length $config{svnpath}) {
$change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) { if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
push @changed_pages, $1; push @changed_pages, $1;
}
}
else {
push @changed_pages, $change;
} }
} }

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
ikiwiki (2.11) UNRELEASED; urgency=low
* Correct a pair of logic errors that triggered if svnpath was empty.
-- Joey Hess <joeyh@debian.org> Sun, 21 Oct 2007 18:49:40 -0400
ikiwiki (2.10) unstable; urgency=low ikiwiki (2.10) unstable; urgency=low
* Tidy ctime debug output for git. * Tidy ctime debug output for git.