t/git-cgi.t: fix race condition

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

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 074026ff299a7d2c51b56a44be564e3b26104d59..7a6a554952079787f8d5c15b4c4f74159812d1c9 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -199,12 +199,12 @@ sub create_temp_working_dir ($$) {
        return $working;
 }
 
        return $working;
 }
 

-sub safe_git (&@) {
+sub safe_git {

        # Start a child process safely without resorting to /bin/sh.
        # Returns command output (in list content) or success state
        # (in scalar context), or runs the specified data handler.
 
        # Start a child process safely without resorting to /bin/sh.
        # Returns command output (in list content) or success state
        # (in scalar context), or runs the specified data handler.
 

-       my ($error_handler, $data_handler, @cmdline) = @_;
+       my %params = @_;

 
        my $pid = open my $OUT, "-|";
 
 
        my $pid = open my $OUT, "-|";
 


@@ -221,7 +221,12 @@ sub safe_git (&@) {
                        chdir $git_dir_stack[0]
                            or error("cannot chdir to $git_dir_stack[0]: $!");
                }
                        chdir $git_dir_stack[0]
                            or error("cannot chdir to $git_dir_stack[0]: $!");
                }

-               exec @cmdline or error("Cannot exec '@cmdline': $!");
+
+               if ($params{stdout}) {
+                       open(STDOUT, '>&', $params{stdout}) or error("Cannot reopen stdout: $!");
+               }
+
+               exec @{$params{cmdline}} or error("Cannot exec '@{$params{cmdline}}': $!");

        }
        # In parent.
 
        }
        # In parent.
 


@@ -236,24 +241,24 @@ sub safe_git (&@) {
 
                chomp;
 
 
                chomp;
 

-               if (! defined $data_handler) {
+               if (! defined $params{data_handler}) {

                        push @lines, $_;
                }
                else {
                        push @lines, $_;
                }
                else {

-                       last unless $data_handler->($_);
+                       last unless $params{data_handler}->($_);

                }
        }
 
        close $OUT;
 
                }
        }
 
        close $OUT;
 

-       $error_handler->("'@cmdline' failed: $!") if $? && $error_handler;
+       $params{error_handler}->("'@{$params{cmdline}}' failed: $!") if $? && $params{error_handler};

 
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.
 
        return wantarray ? @lines : ($? == 0);
 }
 # Convenient wrappers.

-sub run_or_die ($@) { safe_git(\&error, undef, @_) }
-sub run_or_cry ($@) { safe_git(sub { warn @_ }, undef, @_) }
-sub run_or_non ($@) { safe_git(undef, undef, @_) }
+sub run_or_die ($@) { safe_git(error_handler => \&error, cmdline => \@_) }
+sub run_or_cry ($@) { safe_git(error_handler => sub { warn @_ }, cmdline => \@_) }
+sub run_or_non ($@) { safe_git(cmdline => \@_) }

 
 sub ensure_committer {
        if (! length $ENV{GIT_AUTHOR_NAME} || ! length $ENV{GIT_COMMITTER_NAME}) {
 
 sub ensure_committer {
        if (! length $ENV{GIT_AUTHOR_NAME} || ! length $ENV{GIT_COMMITTER_NAME}) {


@@ -824,7 +829,11 @@ sub rcs_diff ($;$) {
                        if (@lines || $line=~/^diff --git/);
                return 1;
        };
                        if (@lines || $line=~/^diff --git/);
                return 1;
        };

-       safe_git(undef, $addlines, "git", "show", $sha1);
+       safe_git(
+               error_handler => undef,
+               data_handler => $addlines,
+               cmdline => ["git", "show", $sha1],
+       );

        if (wantarray) {
                return @lines;
        }
        if (wantarray) {
                return @lines;
        }


@@ -954,11 +963,11 @@ sub git_parse_changes {
                                die $@ if $@;
                                my $fh;
                                ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);
                                die $@ if $@;
                                my $fh;
                                ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1);

-                               my $cmd = "cd $git_dir_stack[0] && ".
-                                         "git show $detail->{sha1_to} > '$path'";
-                               if (system($cmd) != 0) {
-                                       error("failed writing temp file '$path'.");
-                               }
+                               safe_git(
+                                       error_handler => sub { error("failed writing temp file '$path': ".shift."."); },
+                                       stdout => $fh,
+                                       cmdline => ['git', 'show', $detail->{sha1_to}],
+                               );

                        }
 
                        push @rets, {
                        }
 
                        push @rets, {


@@ -1029,10 +1038,6 @@ sub rcs_preprevert ($) {
                my $failure;
                my @ret;
                eval {
                my $failure;
                my @ret;
                eval {

-                       IkiWiki::disable_commit_hook();
-                       push @undo, sub {
-                               IkiWiki::enable_commit_hook();
-                       };

                        my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique
 
                        push @undo, sub {
                        my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique
 
                        push @undo, sub {


@@ -1090,7 +1095,7 @@ sub rcs_revert ($) {
 
        ensure_committer();
 
 
        ensure_committer();
 

-       if (run_or_non('git', 'merge', '--ff-only', "ikiwiki_revert_$sha1")) {
+       if (run_or_non('git', 'cherry-pick', '--no-commit', "ikiwiki_revert_$sha1")) {

                return undef;
        }
        else {
                return undef;
        }
        else {