add rcs_commit_staged and rcs_rename

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

diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index a04bfe1cbe39a41d48937b4006215b1222ff2183..e414e85d2da2136475527a6b5a20f4f1c45f6703 100644 (file)
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
-package IkiWiki;
-
 sub bzr_log ($) { #{{{
        my $out = shift;
        my @infos = ();
@@ -43,7 +43,7 @@ sub bzr_log ($) { #{{{
 } #}}}
 
 sub rcs_update () { #{{{
-       my @cmdline = ("bzr", $config{srcdir}, "update");
+       my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});
        if (system(@cmdline) != 0) {
                warn "'@cmdline' failed: $!";
        }
@@ -71,7 +71,7 @@ sub rcs_commit ($$$;$$) { #{{{
                $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: $!";
@@ -80,21 +80,38 @@ sub rcs_commit ($$$;$$) { #{{{
        return undef; # success
 } #}}}
 
+sub rcs_commit_staged ($$$) {
+       # Commits all staged changes. Changes can be staged using rcs_add,
+       # rcs_remove, and rcs_rename.
+       my ($message, $user, $ipaddr)=@_;
+       
+       error("rcs_commit_staged not implemented for bzr"); # TODO
+}
+
 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: $!";
        }
 } #}}}
 
+sub rcs_remove ($) { # {{{
+       my ($file) = @_;
+
+       error("rcs_remove not implemented for bzr"); # TODO
+} #}}}
+
+sub rcs_rename ($$) { # {{{
+       my ($src, $dest) = @_;
+
+       error("rcs_rename not implemented for bzr"); # TODO
+} #}}}
+
 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 |");