Complete rcs_preprevert and lightly test.

1 files changed, 109 insertions, 79 deletions

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index a68bd0b0e..46fa7d2e0 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -722,101 +722,130 @@ sub rcs_getmtime ($) {
 	return findtimes($file, 0);
 }
 
-sub rcs_receive () {
-	# The wiki may not be the only thing in the git repo.
-	# Determine if it is in a subdirectory by examining the srcdir,
-	# and its parents, looking for the .git directory.
-	my $subdir="";
-	my $dir=$config{srcdir};
-	while (! -d "$dir/.git") {
-		$subdir=IkiWiki::basename($dir)."/".$subdir;
-		$dir=IkiWiki::dirname($dir);
-		if (! length $dir) {
-			error("cannot determine root of git repo");
-		}
-	}
+{
+my $git_root;
+sub git_find_root {
+    # The wiki may not be the only thing in the git repo.
+    # Determine if it is in a subdirectory by examining the srcdir,
+    # and its parents, looking for the .git directory.
+
+    return $git_root if $git_root;
+
+    my $subdir="";
+    my $dir=$config{srcdir};
+    while (! -d "$dir/.git") {
+        $subdir=IkiWiki::basename($dir)."/".$subdir;
+        $dir=IkiWiki::dirname($dir);
+        if (! length $dir) {
+            error("cannot determine root of git repo");
+        }
+    }
+
+    return $subdir;
+}
+}
+
+sub git_parse_changes {
+    my @changes = @_;
+
+    my $subdir = git_find_root();
+    my @rets;
+    foreach my $ci (@changes) {
+        foreach my $detail (@{ $ci->{'details'} }) {
+            my $file = $detail->{'file'};
+
+            # check that all changed files are in the
+            # subdir
+            if (length $subdir &&
+                ! ($file =~ s/^\Q$subdir\E//)) {
+                error sprintf(gettext("you are not allowed to change %s"), $file);
+            }
+
+            my ($action, $mode, $path);
+            if ($detail->{'status'} =~ /^[M]+\d*$/) {
+                $action="change";
+                $mode=$detail->{'mode_to'};
+            }
+            elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
+                $action="add";
+                $mode=$detail->{'mode_to'};
+            }
+            elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
+                $action="remove";
+                $mode=$detail->{'mode_from'};
+            }
+            else {
+                error "unknown status ".$detail->{'status'};
+            }
+
+            # test that the file mode is ok
+            if ($mode !~ /^100[64][64][64]$/) {
+                error sprintf(gettext("you cannot act on a file with mode %s"), $mode);
+            }
+            if ($action eq "change") {
+                if ($detail->{'mode_from'} ne $detail->{'mode_to'}) {
+                    error gettext("you are not allowed to change file modes");
+                }
+            }
+
+            # extract attachment to temp file
+            if (($action eq 'add' || $action eq 'change') &&
+                ! pagetype($file)) {
+
+                eval q{use File::Temp};
+                die $@ if $@;
+                my $fh;
+                ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
+                # Ensure we run this in the right place, see comments in rcs_receive.
+                my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ")
+                    . "git show $detail->{sha1_to} > '$path'";
+                if (system($cmd) != 0) {
+                    error("failed writing temp file '$path'.");
+                }
+            }
+
+            push @rets, {
+                file => $file,
+                action => $action,
+                path => $path,
+            };
+        }
+    }
+
+    return @rets;
+}
 
+sub rcs_receive () {
 	my @rets;
 	while (<>) {
 		chomp;
 		my ($oldrev, $newrev, $refname) = split(' ', $_, 3);
-		
+
 		# only allow changes to gitmaster_branch
 		if ($refname !~ /^refs\/heads\/\Q$config{gitmaster_branch}\E$/) {
 			error sprintf(gettext("you are not allowed to change %s"), $refname);
 		}
-		
+
 		# Avoid chdir when running git here, because the changes
 		# are in the master git repo, not the srcdir repo.
-		# The pre-recieve hook already puts us in the right place.
+		# The pre-receive hook already puts us in the right place.
 		$no_chdir=1;
-		my @changes=git_commit_info($oldrev."..".$newrev);
+                push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev));
 		$no_chdir=0;
-
-		foreach my $ci (@changes) {
-			foreach my $detail (@{ $ci->{'details'} }) {
-				my $file = $detail->{'file'};
-
-				# check that all changed files are in the
-				# subdir
-				if (length $subdir &&
-				    ! ($file =~ s/^\Q$subdir\E//)) {
-					error sprintf(gettext("you are not allowed to change %s"), $file);
-				}
-
-				my ($action, $mode, $path);
-				if ($detail->{'status'} =~ /^[M]+\d*$/) {
-					$action="change";
-					$mode=$detail->{'mode_to'};
-				}
-				elsif ($detail->{'status'} =~ /^[AM]+\d*$/) {
-					$action="add";
-					$mode=$detail->{'mode_to'};
-				}
-				elsif ($detail->{'status'} =~ /^[DAM]+\d*/) {
-					$action="remove";
-					$mode=$detail->{'mode_from'};
-				}
-				else {
-					error "unknown status ".$detail->{'status'};
-				}
-				
-				# test that the file mode is ok
-				if ($mode !~ /^100[64][64][64]$/) {
-					error sprintf(gettext("you cannot act on a file with mode %s"), $mode);
-				}
-				if ($action eq "change") {
-					if ($detail->{'mode_from'} ne $detail->{'mode_to'}) {
-						error gettext("you are not allowed to change file modes");
-					}
-				}
-				
-				# extract attachment to temp file
-				if (($action eq 'add' || $action eq 'change') &&
-				     ! pagetype($file)) {
-					eval q{use File::Temp};
-					die $@ if $@;
-					my $fh;
-					($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
-					if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
-						error("failed writing temp file");
-					}
-				}
-
-				push @rets, {
-					file => $file,
-					action => $action,
-					path => $path,
-				};
-			}
-		}
 	}
 
 	return reverse @rets;
 }
 
-sub rcs_preprevert ($) {
-    # FIXME implement
+sub rcs_preprevert (@) {
+    # Determine what the effects are of reverting the patch with the
+    # ID given by 'rev'. Returns the same structure as rcs_receive.
+    # FIXME note test_changes expects 'cgi' and 'session' parameters.
+    my %params = @_;
+    my $rev = $params{rev};
+
+    require IkiWiki::Receive;
+    IkiWiki::Receive::test_changes(%params, changes => [git_parse_changes(git_commit_info($rev, 1))]);
 }
 
 sub rcs_revert (@) {
@@ -836,9 +865,10 @@ sub rcs_revert (@) {
     }
 }
 
-sub rcs_showpatch ($) {
+sub rcs_showpatch (@) {
     # Show the patch with the given revision id.
-    my ($rev) = @_;
+    my %params = @_;
+    my $rev = $params{rev};
 
     # FIXME check
     my @r = run_or_die('git', 'show', $rev);