include a simplified mrconfig and move the hairy stuff to mrconfig.complex

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 1aee75afa54ed0c40eb5811b034774af234917f5..76c629ca1ddd1c2ceaa147aa6125a5f9b9b9f666 100755 (executable)
--- a/mr
+++ b/mr
@@ -579,10 +579,11 @@ sub mrs { #{{{
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);
                        pipe(my $errfh, CHILD_STDERR);
                        my $repo = shift @repos;
                        pipe(my $outfh, CHILD_STDOUT);
                        pipe(my $errfh, CHILD_STDERR);

-                       unless (my $pid = fork) {
-                               die "cannot fork: $!" unless defined $pid;
-                               open(STDOUT, ">&CHILD_STDOUT") || die "reopen stdout: $!";
-                               open(STDERR, ">&CHILD_STDERR") || die "reopen stderr: $!";
+                       my $pid;
+                       unless ($pid = fork) {
+                               die "mr $action: cannot fork: $!" unless defined $pid;
+                               open(STDOUT, ">&CHILD_STDOUT") || die "mr $action cannot reopen stdout: $!";
+                               open(STDERR, ">&CHILD_STDERR") || die "mr $action cannot reopen stderr: $!";

                                close CHILD_STDOUT;
                                close CHILD_STDERR;
                                close $outfh;
                                close CHILD_STDOUT;
                                close CHILD_STDERR;
                                close $outfh;


@@ -591,7 +592,7 @@ sub mrs { #{{{
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;
                        }
                        close CHILD_STDOUT;
                        close CHILD_STDERR;

-                       push @active, $repo;
+                       push @active, [$pid, $repo];

                        push @fhs, [$outfh, $errfh];
                        push @out, ['',     ''];
                }
                        push @fhs, [$outfh, $errfh];
                        push @out, ['',     ''];
                }


@@ -615,10 +616,11 @@ sub mrs { #{{{
                                                $fhs[$i][$channel] = undef;
                                                if (! defined $fhs[$i][0] &&
                                                    ! defined $fhs[$i][1]) {
                                                $fhs[$i][$channel] = undef;
                                                if (! defined $fhs[$i][0] &&
                                                    ! defined $fhs[$i][1]) {

+                                                       waitpid($active[$i][0], 0);

                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];
                                                        print "\n";
                                                        print STDOUT $out[$i][0];
                                                        print STDERR $out[$i][1];
                                                        print "\n";

-                                                       record($active[$i], $? >> 8);
+                                                       record($active[$i][1], $? >> 8);

                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);
                                                        splice(@fhs, $i, 1);
                                                        splice(@active, $i, 1);
                                                        splice(@out, $i, 1);