aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-04-16 18:43:51 -0400
committerJoey Hess <joey@gnu.kitenet.net>2010-04-16 18:46:20 -0400
commitb13bb0c83c8f23bca97734882997fd3dc29f0553 (patch)
tree0cf2f0d761a86af620338531fb6353dd10b69cab
parentdee2940c0bc97080088c99f399cd0ff0df3bec23 (diff)
downloadikiwiki-b13bb0c83c8f23bca97734882997fd3dc29f0553.tar
ikiwiki-b13bb0c83c8f23bca97734882997fd3dc29f0553.tar.gz
implement rcs_getmtime for svn
This is a slow implementation; it runs svn log once per file still, rather than running svn log once on the whole srcdir. I did it this way because in my experience, svn log, run on a directory, does not always list every change to files inside that directory. I don't know why, and I use svn as little as possible these days.
-rw-r--r--IkiWiki/Plugin/svn.pm42
-rw-r--r--debian/changelog2
-rw-r--r--doc/rcs.mdwn2
3 files changed, 33 insertions, 13 deletions
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 85c205f09..6e1d4a40f 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -350,9 +350,18 @@ sub rcs_diff ($) {
return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`;
}
-sub rcs_getctime ($) {
+{
+
+my ($lastfile, $lastmtime, $lastctime);
+
+sub findtimes ($) {
my $file=shift;
+ if ($lastfile eq $file) {
+ return $lastmtime, $lastctime;
+ }
+ $lastfile=$file;
+
my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
my $child = open(SVNLOG, "-|");
@@ -360,28 +369,39 @@ sub rcs_getctime ($) {
exec("svn", "log", $file) || error("svn log $file failed to run");
}
- my $date;
+ my ($cdate, $mdate);
while (<SVNLOG>) {
if (/$svn_log_infoline/) {
- $date=$1;
+ $cdate=$1;
+ $mdate=$1 unless defined $mdate;
}
}
- close SVNLOG || warn "svn log $file exited $?";
+ close SVNLOG || error "svn log $file exited $?";
- if (! defined $date) {
- warn "failed to parse svn log for $file\n";
- return 0;
+ if (! defined $cdate) {
+ error "failed to parse svn log for $file\n";
}
eval q{use Date::Parse};
error($@) if $@;
- $date=str2time($date);
- debug("found ctime ".localtime($date)." for $file");
- return $date;
+
+ $lastctime=str2time($cdate);
+ $lastmtime=str2time($mdate);
+ return $lastmtime, $lastctime;
+}
+
+}
+
+sub rcs_getctime ($) {
+ my $file=shift;
+
+ return (findtimes($file))[1];
}
sub rcs_getmtime ($) {
- error "rcs_getmtime is not implemented for svn\n"; # TODO
+ my $file=shift;
+
+ return (findtimes($file))[0];
}
1
diff --git a/debian/changelog b/debian/changelog
index 60a67cbe3..774aedc40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
* Automatically run --gettime the first time ikiwiki is run on
a given srcdir.
* Add rcs_getmtime to plugin API; currently only implemented
- for git.
+ for git and svn.
* 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.
diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn
index b5bfc2414..450d16800 100644
--- a/doc/rcs.mdwn
+++ b/doc/rcs.mdwn
@@ -28,7 +28,7 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes
`rcs_remove` |yes |yes |yes |yes |no |yes |no |yes
`rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes
`rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow
-`rcs_getmtime` |fast |no |no |no |no |no |no |no
+`rcs_getmtime` |fast |slow |no |no |no |no |no |no
anonymous push |yes |no |no |no |no |no |no |no
conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes
"""]]