automatically run --gettime, and optimise it for git

* Automatically run --gettime the first time ikiwiki is run on
  a given srcdir.
* Optimise --gettime for git, so it's appropriatly screamingly
  fast. (This could be done for other backends too.)
* However, --gettime for git no longer follows renames.
* Use above to fix up timestamps on docwiki, as well as ensure that
  timestamps on basewiki files shipped in the deb are sane.

2 files changed, 45 insertions, 14 deletions

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 86d80186f..aa402c04f 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -616,27 +616,51 @@ sub rcs_diff ($) {
 	}
 }
 
-sub rcs_getctime ($) {
+{
+my %time_cache;
+
+sub findtimes ($$) {
 	my $file=shift;
+	my $id=shift; # 0 = mtime ; 1 = ctime
+
 	# Remove srcdir prefix
 	$file =~ s/^\Q$config{srcdir}\E\/?//;
 
-	my @raw_lines = run_or_die('git', 'log', 
-		'--follow', '--no-merges',
-		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
-		'-r', '--', $file);
-	my @ci;
-	while (my $parsed = parse_diff_tree("", \@raw_lines)) {
-		push @ci, $parsed;
+	if (! keys %time_cache) {
+		my $date;
+		foreach my $line (run_or_die('git', 'log',
+				'--pretty=format:%ct',
+				'--name-only', '--relative')) {
+			if (! defined $date && $line =~ /^(\d+)$/) {
+				$date=$line;
+			}
+			elsif (! length $line) {
+				$date=undef;
+			}
+			else {
+				if (! $time_cache{$line}) {
+					$time_cache{$line}[0]=$date; # mtime
+				}
+				$time_cache{$line}[1]=$date; # ctime
+			}
+		}
 	}
-	my $ctime = $ci[$#ci]->{'author_epoch'};
-	debug("ctime for '$file': ". localtime($ctime));
 
-	return $ctime;
+	return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0;
+}
+
+}
+
+sub rcs_getctime ($) {
+	my $file=shift;
+
+	return findtimes($file, 1);
 }
 
 sub rcs_getmtime ($) {
-	error "rcs_getmtime is not implemented for git\n"; # TODO
+	my $file=shift;
+
+	return findtimes($file, 0);
 }
 
 sub rcs_receive () {
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e1cb68462..a6b0f0617 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -352,6 +352,8 @@ sub find_new_files ($) {
 	my @new;
 	my @internal_new;
 
+	my $times_noted;
+
 	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
@@ -363,7 +365,12 @@ sub find_new_files ($) {
 			if (isinternal($page)) {
 				push @internal_new, $file;
 			}
-			else {
+			elsif ($config{rcs}) {
+				if (! $times_noted) {
+					debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+					$times_noted=1;
+				}
+
 				push @new, $file;
 				if ($config{gettime} && -e "$config{srcdir}/$file") {
 					eval {
@@ -377,7 +384,7 @@ sub find_new_files ($) {
 					}
 					my $mtime;
 					eval {
-						my $mtime=rcs_getmtime("$config{srcdir}/$file");
+						$mtime=rcs_getmtime("$config{srcdir}/$file");
 					};
 					if ($@) {
 						print STDERR $@;