Optimise the no-op post-commit hook in the web edit case by skipping loading plugins...

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 5c2d710b9c75e1eb045b70c1f5930a96865aab89..fd21b49112527343c6f63e9eae88f7506a9eb134 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -10,7 +10,8 @@ use lib '.'; # For use in nonstandard directory, munged by Makefile.
 use IkiWiki;
 
 sub usage () { #{{{
-       die gettext("usage: ikiwiki [options] source dest"), "\n";
+       die gettext("usage: ikiwiki [options] source dest"), "\n",
+           gettext("       ikiwiki --setup configfile"), "\n";
 } #}}}
 
 sub getconfig () { #{{{
@@ -26,7 +27,7 @@ sub getconfig () { #{{{
                                IkiWiki::Setup::load($_[1]);
                                $config{setupverbose}=$config{verbose};
                                $config{setupsyslog}=$config{syslog};
-                               $config{verbose}=$verbose;
+                               $config{verbose}=$verbose || $config{setupverbose};
                                $config{syslog}=$syslog;
                                $config{setup}=1;
                        },
@@ -94,6 +95,7 @@ sub getconfig () { #{{{
                                print "ikiwiki version $IkiWiki::version\n";
                                exit;
                        },
+                       "help|h" => sub { $SIG{__WARN__}=sub {}; die },
                ) || usage();
 
                if (! $config{setup} && ! $config{render}) {
@@ -116,6 +118,12 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
+
+               # optimisation for no-op post_commit 
+               if ($config{post_commit} && ! commit_hook_enabled()) {
+                       exit 0;
+               }
+
                loadplugins();
                checkconfig();
        }
@@ -182,7 +190,7 @@ sub main () { #{{{
                # do nothing
        }
        else {
-               if (! $config{refresh}) {
+               if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));
                }
                else {