summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-28 15:13:45 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-28 15:13:45 -0400
commit125c6ec65028f46ed3c4dc3bbf6e26c2890a2262 (patch)
treea827d9d176f444d856c06bd10249b765d9afaa9c
parent4e3a2a370cdc431091b32e8d5fa03c8718e6ea4a (diff)
<pedant>rename depends_exact to depends_simple
It's not "exact" since case munging has to be done, and I think "simple" captures the optimisation better.</pedant> With apologies to smcv, who probably has to rebuild his wiki now.
-rw-r--r--IkiWiki.pm18
-rw-r--r--IkiWiki/Render.pm10
2 files changed, 14 insertions, 14 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8bded8a0e..b8e89b73f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,8 +13,8 @@ use open qw{:utf8 :std};
use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
%pagestate %wikistate %renderedfiles %oldrenderedfiles
- %pagesources %destsources %depends %hooks %forcerebuild
- %loaded_plugins %depends_exact};
+ %pagesources %destsources %depends %depends_simple %hooks
+ %forcerebuild %loaded_plugins};
use Exporter q{import};
our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
@@ -1476,7 +1476,7 @@ sub loadindex () {
if (! $config{rebuild}) {
%pagesources=%pagemtime=%oldlinks=%links=%depends=
%destsources=%renderedfiles=%pagecase=%pagestate=
- %depends_exact=();
+ %depends_simple=();
}
my $in;
if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
@@ -1516,9 +1516,9 @@ sub loadindex () {
$links{$page}=$d->{links};
$oldlinks{$page}=[@{$d->{links}}];
}
- if (exists $d->{depends_exact}) {
- $depends_exact{$page}={
- map { $_ => 1 } @{$d->{depends_exact}}
+ if (exists $d->{depends_simple}) {
+ $depends_simple{$page}={
+ map { $_ => 1 } @{$d->{depends_simple}}
};
}
if (exists $d->{dependslist}) {
@@ -1576,8 +1576,8 @@ sub saveindex () {
$index{page}{$src}{dependslist} = [ keys %{$depends{$page}} ];
}
- if (exists $depends_exact{$page}) {
- $index{page}{$src}{depends_exact} = [ keys %{$depends_exact{$page}} ];
+ if (exists $depends_simple{$page}) {
+ $index{page}{$src}{depends_simple} = [ keys %{$depends_simple{$page}} ];
}
if (exists $pagestate{$page}) {
@@ -1751,7 +1751,7 @@ sub add_depends ($$) {
if ($pagespec =~ /$config{wiki_file_regexp}/ &&
$pagespec !~ /[\s*?()!]/) {
# a simple dependency, which can be matched by string eq
- $depends_exact{$page}{lc $pagespec} = 1;
+ $depends_simple{$page}{lc $pagespec} = 1;
return 1;
}
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 85ae0f8e9..246c2260d 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -210,7 +210,7 @@ sub render ($) {
if (defined $type) {
my $page=pagename($file);
delete $depends{$page};
- delete $depends_exact{$page};
+ delete $depends_simple{$page};
will_render($page, htmlpage($page), 1);
return if $type=~/^_/;
@@ -225,7 +225,7 @@ sub render ($) {
}
else {
delete $depends{$file};
- delete $depends_exact{$file};
+ delete $depends_simple{$file};
will_render($file, $file, 1);
if ($config{hardlink}) {
@@ -433,7 +433,7 @@ sub refresh () {
# internal pages are not rendered
my $page=pagename($file);
delete $depends{$page};
- delete $depends_exact{$page};
+ delete $depends_simple{$page};
foreach my $old (@{$renderedfiles{$page}}) {
delete $destsources{$old};
}
@@ -465,8 +465,8 @@ sub refresh () {
my $p=pagename($f);
my $reason = undef;
- if (exists $depends_exact{$p}) {
- foreach my $d (keys %{$depends_exact{$p}}) {
+ if (exists $depends_simple{$p}) {
+ foreach my $d (keys %{$depends_simple{$p}}) {
if (exists $lcchanged{$d}) {
$reason = $d;
last;