Merge branch 'master' into commentreorg

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 5df522f6ee69b4cd6bdec394fbd495957a8424d2..e7c1b8d8e1a801d1ffb1318d65266bc9396a0de0 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-
-package IkiWiki;
+package IkiWiki::Plugin::bzr;

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


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

-hook(type => "checkconfig", id => "bzr", call => sub { #{{{
-       if (! defined $config{diffurl}) {
-               $config{diffurl}="";
-       }
-       if (length $config{bzr_wrapper}) {
+sub import {
+       hook(type => "checkconfig", id => "bzr", call => \&checkconfig);
+       hook(type => "getsetup", id => "bzr", 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);
+       hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
+}
+
+sub checkconfig () {
+       if (defined $config{bzr_wrapper} && length $config{bzr_wrapper}) {

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

-}); #}}}
+}

 
 

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

        return
        return

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

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

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

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


@@ -50,73 +67,82 @@ hook(type => "getsetup", id => "bzr", call => sub { #{{{
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

-}); #}}}
+}

 
 

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

        my $out = shift;
        my @infos = ();
        my $key = undef;
 
        my $out = shift;
        my @infos = ();
        my $key = undef;
 

+       my %info;

        while (<$out>) {
                my $line = $_;
                my ($value);
                if ($line =~ /^message:/) {
                        $key = "message";
        while (<$out>) {
                my $line = $_;
                my ($value);
                if ($line =~ /^message:/) {
                        $key = "message";

-                       $infos[$#infos]{$key} = "";
+                       $info{$key} = "";

                }
                elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
                        $key = "files";
                }
                elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
                        $key = "files";

-                       unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; }
+                       $info{$key} = "" unless defined $info{$key};

                }
                elsif (defined($key) and $line =~ /^  (.*)/) {
                }
                elsif (defined($key) and $line =~ /^  (.*)/) {

-                       $infos[$#infos]{$key} .= "$1\n";
+                       $info{$key} .= "$1\n";

                }
                elsif ($line eq "------------------------------------------------------------\n") {
                }
                elsif ($line eq "------------------------------------------------------------\n") {

+                       push @infos, {%info} if keys %info;
+                       %info = ();

                        $key = undef;
                        $key = undef;

-                       push (@infos, {});

                }
                }

-               else {
+               elsif ($line =~ /: /) {

                        chomp $line;
                        chomp $line;

+                       if ($line =~ /^revno: (\d+)/) {
+                           $key = "revno";
+                           $value = $1;
+                       }
+                       else {

                                ($key, $value) = split /: +/, $line, 2;
                                ($key, $value) = split /: +/, $line, 2;

-                       $infos[$#infos]{$key} = $value;
-               } 
+                       }
+                       $info{$key} = $value;
+               }

        }
        close $out;
        }
        close $out;

+       push @infos, {%info} if keys %info;

 
        return @infos;
 
        return @infos;

-} #}}}
+}

 
 

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

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

-} #}}}
+}

 
 

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

        return "";
        return "";

-} #}}}
+}

 
 

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

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

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

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

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

        }
        else {
                return "Anonymous";
        }
        }
        else {
                return "Anonymous";
        }

-} #}}}
+}

 
 

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

        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        $user = bzr_author($user, $ipaddr);
 
        my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
 
        $user = bzr_author($user, $ipaddr);
 

-       $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";
        }


@@ -128,7 +154,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,


@@ -137,7 +163,7 @@ sub rcs_commit_staged ($$$) {
 
        $user = bzr_author($user, $ipaddr);
 
 
        $user = bzr_author($user, $ipaddr);
 

-       $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";
        }


@@ -149,30 +175,30 @@ sub rcs_commit_staged ($$$) {
        }
 
        return undef; # success
        }
 
        return undef; # success

-} #}}}
+}

 
 

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

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

-} #}}}
+}

 
 

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

        my ($file) = @_;
 
        my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        my ($file) = @_;
 
        my @cmdline = ("bzr", "rm", "--force", "--quiet", "$config{srcdir}/$file");
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

-} #}}}
+}

 
 

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

        my ($src, $dest) = @_;
 
        my ($src, $dest) = @_;
 

-       my $parent = dirname($dest);
+       my $parent = IkiWiki::dirname($dest);

        if (system("bzr", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
                warn("bzr add $parent failed\n");
        }
        if (system("bzr", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
                warn("bzr add $parent failed\n");
        }


@@ -181,9 +207,9 @@ sub rcs_rename ($$) { # {{{
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }

-} #}}}
+}

 
 

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

        my ($num) = @_;
 
        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
        my ($num) = @_;
 
        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 


@@ -197,7 +223,7 @@ sub rcs_recentchanges ($) { #{{{
        foreach my $info (bzr_log($out)) {
                my @pages = ();
                my @message = ();
        foreach my $info (bzr_log($out)) {
                my @pages = ();
                my @message = ();

-        
+

                foreach my $msgline (split(/\n/, $info->{message})) {
                        push @message, { line => $msgline };
                }
                foreach my $msgline (split(/\n/, $info->{message})) {
                        push @message, { line => $msgline };
                }


@@ -211,7 +237,7 @@ sub rcs_recentchanges ($) { #{{{
                        # Skip source name in renames
                        $filename =~ s/^.* => //;
 
                        # Skip source name in renames
                        $filename =~ s/^.* => //;
 

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

                        $diffurl =~ s/\[\[file\]\]/$filename/go;
                        $diffurl =~ s/\[\[file-id\]\]/$fileid/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;
                        $diffurl =~ s/\[\[file\]\]/$filename/go;
                        $diffurl =~ s/\[\[file-id\]\]/$fileid/go;
                        $diffurl =~ s/\[\[r2\]\]/$info->{revno}/go;


@@ -231,23 +257,39 @@ sub rcs_recentchanges ($) { #{{{
                        rev        => $info->{"revno"},
                        user       => $user,
                        committype => "bzr",
                        rev        => $info->{"revno"},
                        user       => $user,
                        committype => "bzr",

-                       when       => time - str2time($info->{"timestamp"}),
+                       when       => str2time($info->{"timestamp"}),

                        message    => [@message],
                        pages      => [@pages],
                };
        }
 
        return @ret;
                        message    => [@message],
                        pages      => [@pages],
                };
        }
 
        return @ret;

-} #}}}
+}

 
 

-sub rcs_getctime ($) { #{{{
-       my ($file) = @_;
+sub rcs_diff ($) {
+       my $taintedrev=shift;
+       my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint

 
 

-       # XXX filename passes through the shell here, should try to avoid
-       # that just in case
-       my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
+       my $prevspec = "before:" . $rev;
+       my $revspec = "revno:" . $rev;
+       my @cmdline = ("bzr", "diff", "--old", $config{srcdir},
+               "--new", $config{srcdir},
+               "-r", $prevspec . ".." . $revspec);

        open (my $out, "@cmdline |");
 
        open (my $out, "@cmdline |");
 

+       my @lines = <$out>;
+       if (wantarray) {
+               return @lines;
+       }
+       else {
+               return join("", @lines);
+       }
+}
+
+sub extract_timestamp (@) {
+       # XXX filename passes through the shell here, should try to avoid
+       # that just in case
+       open (my $out, "@_ |");

        my @log = bzr_log($out);
 
        if (length @log < 1) {
        my @log = bzr_log($out);
 
        if (length @log < 1) {


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

-       my $ctime = str2time($log[0]->{"timestamp"});
-       return $ctime;
-} #}}}
+       my $time = str2time($log[0]->{"timestamp"});
+       return $time;
+}
+
+sub rcs_getctime ($) {
+       my ($file) = @_;
+
+       my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file");
+       return extract_timestamp(@cmdline);
+}
+
+sub rcs_getmtime ($) {
+       my ($file) = @_;
+
+       my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
+       return extract_timestamp(@cmdline);
+}

 
 1
 
 1