meta plugin: also collect [[!meta uuid="..."]]

[ikiwiki.git] / IkiWiki / Rcs / bzr.pm

diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index a04bfe1cbe39a41d48937b4006215b1222ff2183..0dc456de2c1fc652b48491f1584e17e0341f5b59 100644 (file)
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 

-package IkiWiki;
-

 sub bzr_log ($) { #{{{
        my $out = shift;
        my @infos = ();
 sub bzr_log ($) { #{{{
        my $out = shift;
        my @infos = ();


@@ -43,7 +43,7 @@ sub bzr_log ($) { #{{{
 } #}}}
 
 sub rcs_update () { #{{{
 } #}}}
 
 sub rcs_update () { #{{{

-       my @cmdline = ("bzr", $config{srcdir}, "update");
+       my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -71,7 +71,7 @@ sub rcs_commit ($$$;$$) { #{{{
                $message = "no message given";
        }
 
                $message = "no message given";
        }
 

-       my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user,
+       my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,

                       $config{srcdir}."/".$file);
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
                       $config{srcdir}."/".$file);
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";


@@ -83,7 +83,7 @@ sub rcs_commit ($$$;$$) { #{{{
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 
 sub rcs_add ($) { # {{{
        my ($file) = @_;
 

-       my @cmdline = ("bzr", "add", "$config{srcdir}/$file");
+       my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");

        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }


@@ -92,9 +92,6 @@ sub rcs_add ($) { # {{{
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 

-       eval q{use CGI 'escapeHTML'};
-       error($@) if $@;
-

        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
                           $config{srcdir});
        open (my $out, "@cmdline |");
        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
                           $config{srcdir});
        open (my $out, "@cmdline |");