urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* IkiWiki/Plugin/monotone.pm: monotone v0.48 has a small error that 

affects rcs_getctime.  A small adjustment takes care of that.
master
Richard Levitte 2011-03-30 16:59:01 +02:00
parent 83de1e4f1d
commit 9b5a5c1823
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
IkiWiki/Plugin/monotone.pm
View File

@ -9,6 +9,7 @@ use Date::Parse qw(str2time);
use Date::Format qw(time2str);
my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
my $mtn_version = undef;
sub import {
hook(type => "checkconfig", id => "monotone", call => \&checkconfig);
@ -40,20 +41,19 @@ sub checkconfig () {
exec("mtn", "version") || error("mtn version failed to run");
}
my $version=undef;
while (<MTN>) {
if (/^monotone (\d+\.\d+)(?:(?:\.\d+){0,2}|dev)? /) {
$version=$1;
$mtn_version=$1;
}
}
close MTN || debug("mtn version exited $?");
if (!defined($version)) {
if (!defined($mtn_version)) {
error("Cannot determine monotone version");
}
if ($version < 0.38) {
error("Monotone version too old, is $version but required 0.38");
if ($mtn_version < 0.38) {
error("Monotone version too old, is $mtn_version but required 0.38");
}
if (defined $config{mtn_wrapper} && length $config{mtn_wrapper}) {
@ -662,9 +662,11 @@ sub rcs_getctime ($) {
"--brief", $file) || error("mtn log $file failed to run");
}
my $prevRev;
my $firstRev;
while (<MTNLOG>) {
if (/^($sha1_pattern)/) {
$prevRev=$firstRev;
$firstRev=$1;
}
}
@ -678,6 +680,17 @@ sub rcs_getctime ($) {
my $automator = Monotone->new();
$automator->open(undef, $config{mtnrootdir});
# mtn 0.48 has a bug that makes it list the creation of parent
# directories as last (first) log entry... So when we're dealing
# with that version, let's check that the file we're looking for
# is actually part of the last (first) revision. Otherwise, pick
# the one before (after) that one.
if ($mtn_version == 0.48) {
my $changes = [get_changed_files($automator, $firstRev)];
if (! exists {map { $_ => 1 } @$changes}->{$file}) {
$firstRev = $prevRev;
}
}
my $certs = [read_certs($automator, $firstRev)];
$automator->close();