Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 0efc26b4990ee1d2c7f83912c41bc23bdd085677..562d5d3893fcf5c2c0c6ba0b82e574c362f36891 100644 (file)
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -20,6 +20,7 @@ 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 () {


@@ -122,8 +123,13 @@ sub rcs_prepedit ($) {
        return "";
 }
 
        return "";
 }
 

-sub bzr_author ($$) {
-       my ($user, $ipaddr) = @_;
+sub bzr_author ($) {
+       my $session=shift;
+
+       return unless defined $session;
+
+       my $user=$session->param("name");
+       my $ipaddr=$session->remote_addr();

 
        if (defined $user) {
                return IkiWiki::possibly_foolish_untaint($user);
 
        if (defined $user) {
                return IkiWiki::possibly_foolish_untaint($user);


@@ -136,18 +142,19 @@ sub bzr_author ($$) {
        }
 }
 
        }
 }
 

-sub rcs_commit ($$$;$$) {
-       my ($file, $message, $rcstoken, $user, $ipaddr) = @_;
+sub rcs_commit (@) {
+       my %params=@_;

 
 

-       $user = bzr_author($user, $ipaddr);
+       my $user=bzr_author($params{session});

 
 

-       $message = IkiWiki::possibly_foolish_untaint($message);
-       if (! length $message) {
-               $message = "no message given";
+       $params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+       if (! length $params{message}) {
+               $params{message} = "no message given";

        }
 
        }
 

-       my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
-                      $config{srcdir}."/".$file);
+       my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+                      (defined $user ? ("--author", $user) : ()),
+                      $config{srcdir}."/".$params{file});

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


@@ -155,19 +162,18 @@ sub rcs_commit ($$$;$$) {
        return undef; # success
 }
 
        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)=@_;
+sub rcs_commit_staged (@) {
+       my %params=@_;

 
 

-       $user = bzr_author($user, $ipaddr);
+       my $user=bzr_author($params{session});

 
 

-       $message = IkiWiki::possibly_foolish_untaint($message);
-       if (! length $message) {
-               $message = "no message given";
+       $params{message} = IkiWiki::possibly_foolish_untaint($params{message});
+       if (! length $params{message}) {
+               $params{message} = "no message given";

        }
 
        }
 

-       my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
+       my @cmdline = ("bzr", "commit", "--quiet", "-m", $params{message},
+                      (defined $user ? ("--author", $user) : ()),

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


@@ -285,14 +291,8 @@ sub rcs_diff ($) {
        }
 }
 
        }
 }
 

-sub rcs_getctime ($) {
-       my ($file) = @_;
-
-       # XXX filename passes through the shell here, should try to avoid
-       # that just in case
-       my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file");
-       open (my $out, "@cmdline |");
-
+sub extract_timestamp (@) {
+       open (my $out, "-|", @_);

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


@@ -302,8 +302,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