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 c96f2d69546f3e95b44e5e3c638064eca7adcfb5..e7c1b8d8e1a801d1ffb1318d65266bc9396a0de0 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 () {


@@ -106,6 +107,7 @@ sub bzr_log ($) {
                }
        }
        close $out;
                }
        }
        close $out;

+       push @infos, {%info} if keys %info;

 
        return @infos;
 }
 
        return @infos;
 }


@@ -284,14 +286,10 @@ sub rcs_diff ($) {
        }
 }
 
        }
 }
 

-sub rcs_getctime ($) {
-       my ($file) = @_;
-
+sub extract_timestamp (@) {

        # XXX filename passes through the shell here, should try to avoid
        # that just in case
        # 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 |");
-
+       open (my $out, "@_ |");

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


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