Explain that command must run unattended, and lose the debug statement.

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

diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 3a98e09d8721c24030e988bdf6473a661e3cc695..11fdec529373c6b430a8e77bebb2c0a3aa6972b7 100644 (file)
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-
-package IkiWiki;
+package IkiWiki::Plugin::mercurial;

 
 use warnings;
 use strict;
 
 use warnings;
 use strict;


@@ -8,24 +7,40 @@ use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use Encode;
 use open qw{:utf8 :std};
 

-hook(type => "checkconfig", id => "mercurial", call => sub { #{{{
-       if (! defined $config{diffurl}) {
-               $config{diffurl}="";
-       }
-       if (length $config{mercurial_wrapper}) {
+sub import {
+       hook(type => "checkconfig", id => "mercurial", call => \&checkconfig);
+       hook(type => "getsetup", id => "mercurial", call => \&getsetup);
+       hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
+       hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
+       hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
+       hook(type => "rcs", id => "rcs_commit_staged", call => \&rcs_commit_staged);
+       hook(type => "rcs", id => "rcs_add", call => \&rcs_add);
+       hook(type => "rcs", id => "rcs_remove", call => \&rcs_remove);
+       hook(type => "rcs", id => "rcs_rename", call => \&rcs_rename);
+       hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges);
+       hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff);
+       hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
+}
+
+sub checkconfig () {
+       if (exists $config{mercurial_wrapper} && length $config{mercurial_wrapper}) {

                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},
                        wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_wrappermode} : "06755"),
                };
        }
                push @{$config{wrappers}}, {
                        wrapper => $config{mercurial_wrapper},
                        wrappermode => (defined $config{mercurial_wrappermode} ? $config{mercurial_wrappermode} : "06755"),
                };
        }

-}); #}}}
+}

 
 

-hook(type => "getsetup", id => "mercurial", call => sub { #{{{
+sub getsetup () {

        return
        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,
                },


@@ -50,9 +65,9 @@ hook(type => "getsetup", id => "mercurial", call => sub { #{{{
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-}); #}}}
+}

 
 

-sub mercurial_log ($) { #{{{
+sub mercurial_log ($) {

        my $out = shift;
        my @infos;
 
        my $out = shift;
        my @infos;
 


@@ -96,33 +111,33 @@ sub mercurial_log ($) { #{{{
        close $out;
 
        return @infos;
        close $out;
 
        return @infos;

-} #}}}
+}

 
 

-sub rcs_update () { #{{{
+sub rcs_update () {

        my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "update");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

-} #}}}
+}

 
 

-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {

        return "";
        return "";

-} #}}}
+}

 
 

-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {

        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        if (defined $user) {
        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        if (defined $user) {

-               $user = possibly_foolish_untaint($user);
+               $user = IkiWiki::possibly_foolish_untaint($user);

        }
        elsif (defined $ipaddr) {
        }
        elsif (defined $ipaddr) {

-               $user = "Anonymous from ".possibly_foolish_untaint($ipaddr);
+               $user = "Anonymous from ".IkiWiki::possibly_foolish_untaint($ipaddr);

        }
        else {
                $user = "Anonymous";
        }
 
        }
        else {
                $user = "Anonymous";
        }
 

-       $message = possibly_foolish_untaint($message);
+       $message = IkiWiki::possibly_foolish_untaint($message);

        if (! length $message) {
                $message = "no message given";
        }
        if (! length $message) {
                $message = "no message given";
        }


@@ -134,7 +149,7 @@ sub rcs_commit ($$$;$$) { #{{{
        }
 
        return undef; # success
        }
 
        return undef; # success

-} #}}}
+}

 
 sub rcs_commit_staged ($$$) {
        # Commits all staged changes. Changes can be staged using rcs_add,
 
 sub rcs_commit_staged ($$$) {
        # Commits all staged changes. Changes can be staged using rcs_add,


@@ -144,28 +159,28 @@ sub rcs_commit_staged ($$$) {
        error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
 
        error("rcs_commit_staged not implemented for mercurial"); # TODO
 }
 

-sub rcs_add ($) { # {{{
+sub rcs_add ($) {

        my ($file) = @_;
 
        my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        my ($file) = @_;
 
        my @cmdline = ("hg", "-q", "-R", "$config{srcdir}", "add", "$config{srcdir}/$file");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

-} #}}}
+}

 
 

-sub rcs_remove ($) { # {{{
+sub rcs_remove ($) {

        my ($file) = @_;
 
        error("rcs_remove not implemented for mercurial"); # TODO
        my ($file) = @_;
 
        error("rcs_remove not implemented for mercurial"); # TODO

-} #}}}
+}

 
 

-sub rcs_rename ($$) { # {{{
+sub rcs_rename ($$) {

        my ($src, $dest) = @_;
 
        error("rcs_rename not implemented for mercurial"); # TODO
        my ($src, $dest) = @_;
 
        error("rcs_rename not implemented for mercurial"); # TODO

-} #}}}
+}

 
 

-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {

        my ($num) = @_;
 
        my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
        my ($num) = @_;
 
        my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,


@@ -185,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;
 


@@ -202,7 +217,7 @@ sub rcs_recentchanges ($) { #{{{
                push @ret, {
                        rev        => $info->{"changeset"},
                        user       => $user,
                push @ret, {
                        rev        => $info->{"changeset"},
                        user       => $user,

-                       committype => "mercurial",
+                       committype => "hg",

                        when       => str2time($info->{"date"}),
                        message    => [@message],
                        pages      => [@pages],
                        when       => str2time($info->{"date"}),
                        message    => [@message],
                        pages      => [@pages],


@@ -210,18 +225,18 @@ sub rcs_recentchanges ($) { #{{{
        }
 
        return @ret;
        }
 
        return @ret;

-} #}}}
+}

 
 

-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {

        # TODO
        # TODO

-} #}}}
+}

 
 

-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {

        my ($file) = @_;
 
        # XXX filename passes through the shell here, should try to avoid
        # that just in case
        my ($file) = @_;
 
        # XXX filename passes through the shell here, should try to avoid
        # that just in case

-       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", '1', 
+       my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v",

                "--style", "default", "$config{srcdir}/$file");
        open (my $out, "@cmdline |");
 
                "--style", "default", "$config{srcdir}/$file");
        open (my $out, "@cmdline |");
 


@@ -234,8 +249,8 @@ sub rcs_getctime ($) { #{{{
        eval q{use Date::Parse};
        error($@) if $@;
        
        eval q{use Date::Parse};
        error($@) if $@;
        

-       my $ctime = str2time($log[0]->{"date"});
+       my $ctime = str2time($log[$#log]->{"date"});

        return $ctime;
        return $ctime;

-} #}}}
+}

 
 1
 
 1