update

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 8830073672663b77d2e21fb837a15a913b7b6c0d..0efc26b4990ee1d2c7f83912c41bc23bdd085677 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -36,6 +36,7 @@ sub getsetup () {
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,
                plugin => {
                        safe => 0, # rcs plugin
                        rebuild => undef,

+                       section => "rcs",

                },
                bzr_wrapper => {
                        type => "string",
                },
                bzr_wrapper => {
                        type => "string",


@@ -72,31 +73,40 @@ sub bzr_log ($) {
        my @infos = ();
        my $key = undef;
 
        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;
 }


@@ -212,7 +222,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 };
                }