Complete rcs_preprevert and lightly test.

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5ce802317f68d3da036aa1894708f97f92152186..7ea919abc3d76c2b9fc280c81ed4f87cbb95d8cb 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -174,23 +174,15 @@ sub scan ($) {
                }
                delete $typedlinks{$page};
 
                }
                delete $typedlinks{$page};
 

-               run_hooks(scan => sub {
-                       shift->(
-                               page => $page,
-                               content => $content,
-                       );
-               });
-

                # Preprocess in scan-only mode.
                preprocess($page, $page, $content, 1);
 
                # Preprocess in scan-only mode.
                preprocess($page, $page, $content, 1);
 

-               run_hooks(rescan => sub {
+               run_hooks(scan => sub {

                        shift->(
                                page => $page,
                                content => $content,
                        );
                });
                        shift->(
                                page => $page,
                                content => $content,
                        );
                });

-

        }
        else {
                will_render($file, $file, 1);
        }
        else {
                will_render($file, $file, 1);


@@ -767,7 +759,10 @@ sub refresh () {
        my ($new, $internal_new)=find_new_files($files);
        my ($del, $internal_del)=find_del_files($pages);
        my ($changed, $internal_changed)=find_changed($files);
        my ($new, $internal_new)=find_new_files($files);
        my ($del, $internal_del)=find_del_files($pages);
        my ($changed, $internal_changed)=find_changed($files);

-       run_hooks(needsbuild => sub { shift->($changed) });
+       run_hooks(needsbuild => sub {
+               my $ret=shift->($changed, [@$del, @$internal_del]);
+               $changed=$ret if ref $ret eq 'ARRAY';
+       });

        my $oldlink_targets=calculate_old_links($changed, $del);
 
        foreach my $file (@$changed) {
        my $oldlink_targets=calculate_old_links($changed, $del);
 
        foreach my $file (@$changed) {