X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f206035a3a7ed0b37c082e80d6d1482983fa583b..1f56dead00ee1188d9ed9650b9b2483b69c4d525:/IkiWiki/Plugin/bzr.pm?ds=inline

diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 6e45c39e4..e7c1b8d8e 100644
--- 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_getmtime", call => \&rcs_getmtime);
 }
 
 sub checkconfig () {
@@ -73,26 +74,24 @@ sub bzr_log ($) {
 	my @infos = ();
 	my $key = undef;
 
-	my $hash = {};
+	my %info;
 	while (<$out>) {
 		my $line = $_;
 		my ($value);
 		if ($line =~ /^message:/) {
 			$key = "message";
-			$$hash{$key} = "";
+			$info{$key} = "";
 		}
 		elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) {
 			$key = "files";
-			unless (defined($$hash{$key})) { $$hash{$key} = ""; }
+			$info{$key} = "" unless defined $info{$key};
 		}
 		elsif (defined($key) and $line =~ /^  (.*)/) {
-			$$hash{$key} .= "$1\n";
+			$info{$key} .= "$1\n";
 		}
 		elsif ($line eq "------------------------------------------------------------\n") {
-			if (keys %$hash) {
-				push (@infos, $hash);
-			}
-			$hash = {};
+			push @infos, {%info} if keys %info;
+			%info = ();
 			$key = undef;
 		}
 		elsif ($line =~ /: /) {
@@ -104,10 +103,11 @@ sub bzr_log ($) {
 			else {
 				($key, $value) = split /: +/, $line, 2;
 			}
-			$$hash{$key} = $value;
+			$info{$key} = $value;
 		}
 	}
 	close $out;
+	push @infos, {%info} if keys %info;
 
 	return @infos;
 }
@@ -286,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
-	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) {
@@ -303,8 +299,22 @@ sub rcs_getctime ($) {
 	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