filecheck: Fixed two bits broken in move from attachment.

[git.ikiwiki.info.git] / IkiWiki / Plugin / mercurial.pm

diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 738be8c327d017a142af27011c569339806dd520..7aceebcdb4821ba46929df6b3245e93fa4365fe6 100644 (file)
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -23,9 +23,6 @@ sub import { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{

-       if (! defined $config{diffurl}) {
-               $config{diffurl}="";
-       }

        if (exists $config{mercurial_wrapper} && length $config{mercurial_wrapper}) {
                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},
        if (exists $config{mercurial_wrapper} && length $config{mercurial_wrapper}) {
                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},


@@ -36,10 +33,14 @@ sub checkconfig () { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 0, # rcs plugin
+                       rebuild => undef,
+               },

                mercurial_wrapper => {
                        type => "string",
                        #example => # FIXME add example
                mercurial_wrapper => {
                        type => "string",
                        #example => # FIXME add example

-                       description => "mercurial post-commit executable to generate",
+                       description => "mercurial post-commit hook to generate",

                        safe => 0, # file
                        rebuild => 0,
                },
                        safe => 0, # file
                        rebuild => 0,
                },


@@ -199,7 +200,7 @@ sub rcs_recentchanges ($) { #{{{
                }
 
                foreach my $file (split / /,$info->{files}) {
                }
 
                foreach my $file (split / /,$info->{files}) {

-                       my $diffurl = $config{'diffurl'};
+                       my $diffurl = defined $config{diffurl} ? $config{'diffurl'} : "";

                        $diffurl =~ s/\[\[file\]\]/$file/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{changeset}/go;
 
                        $diffurl =~ s/\[\[file\]\]/$file/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{changeset}/go;