tag_autocreate fixups

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index e7b22f3c5c5ffb24e8c1379b4dc4399cfaf2e6f8..f79ca7c8f52e53831414d7f327d44664a4bf67b2 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -7,10 +7,7 @@ use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use Encode;
 use open qw{:utf8 :std};
 

-sub import { #{{{
-       if (exists $IkiWiki::hooks{rcs}) {
-               error(gettext("cannot use multiple rcs plugins"));
-       }
+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 => "checkconfig", id => "bzr", call => \&checkconfig);
        hook(type => "getsetup", id => "bzr", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);


@@ -23,23 +20,29 @@ sub import { #{{{
        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_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 () { #{{{
+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"),
                };
        }
        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"),
                };
        }

-} #}}}
+}

 
 

-sub getsetup () { #{{{
+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,
                },


@@ -64,54 +67,63 @@ sub getsetup () { #{{{
                        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) {


@@ -123,9 +135,9 @@ sub bzr_author ($$) { #{{{
        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);


@@ -142,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,


@@ -163,27 +175,27 @@ 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 $parent = IkiWiki::dirname($dest);
        my ($src, $dest) = @_;
 
        my $parent = IkiWiki::dirname($dest);


@@ -195,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, 


@@ -211,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 };
                }


@@ -245,16 +257,36 @@ 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_diff ($) {
+       my $taintedrev=shift;
+       my ($rev) = $taintedrev =~ /^(\d+(\.\d+)*)$/; # untaint
+
+       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 |");
+
+       my @lines = <$out>;
+       if (wantarray) {
+               return @lines;
+       }
+       else {
+               return join("", @lines);
+       }
+}

 
 

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

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


@@ -273,6 +305,10 @@ sub rcs_getctime ($) { #{{{
        
        my $ctime = str2time($log[0]->{"timestamp"});
        return $ctime;
        
        my $ctime = str2time($log[0]->{"timestamp"});
        return $ctime;

-} #}}}
+}
+
+sub rcs_getmtime ($) {
+       error "rcs_getmtime is not implemented for bzr\n"; # TODO
+}

 
 1
 
 1