API: rcs_commit and rcs_commit_staged are passed a new parameter

[ikiwiki.git] / IkiWiki / Plugin / svn.pm

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 85c205f0939bd81d5f22bc7a0a19486dc4404c02..ffacb8cf9534a2055d945224a60bd98fc12e14b7 100644 (file)
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -144,7 +144,7 @@ sub rcs_prepedit ($) {
        }
 }
 
-sub rcs_commit ($$$;$$) {
+sub rcs_commit ($$$;$$$) {
        # Tries to commit the page; returns undef on _success_ and
        # a version of the page with the rcs's conflict markers on failure.
        # The file is relative to the srcdir.
@@ -153,6 +153,7 @@ sub rcs_commit ($$$;$$) {
        my $rcstoken=shift;
        my $user=shift;
        my $ipaddr=shift;
+       my $emailuser=shift;
 
        if (defined $user) {
                $message="web commit by $user".(length $message ? ": $message" : "");
@@ -189,10 +190,10 @@ sub rcs_commit ($$$;$$) {
        return undef # success
 }
 
-sub rcs_commit_staged ($$$) {
+sub rcs_commit_staged ($$$;$) {
        # Commits all staged changes. Changes can be staged using rcs_add,
        # rcs_remove, and rcs_rename.
-       my ($message, $user, $ipaddr)=@_;
+       my ($message, $user, $ipaddr, $emailuser)=@_;
        
        if (defined $user) {
                $message="web commit by $user".(length $message ? ": $message" : "");
@@ -350,9 +351,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 (defined $lastfile && $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 +370,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