* hours_since was broken by design, and fixing it involved changing

[code/myrepos.git] / mr

diff --git a/mr b/mr
index dd55fb821778463df0875a1a81e60ef99dd0674b..89f3281f1137cda05469f33afd05b7df82008a39 100755 (executable)
--- a/mr
+++ b/mr
@@ -229,7 +229,7 @@ mr is run by joey. The second uses the hours_since function
 been at least 12 hours since the last update.
 
   skip = test $(whoami) != joey
 been at least 12 hours since the last update.
 
   skip = test $(whoami) != joey

-  skip = [ "$1" = update ] && [ $(hours_since "$1") -lt 12 ]
+  skip = [ "$1" = update ] && ! hours_since "$1" 12

 
 =item chain
 
 
 =item chain
 


@@ -488,7 +488,7 @@ sub action { #{{{
                        system("mkdir", "-p", $dir);
                }
        }
                        system("mkdir", "-p", $dir);
                }
        }

-       elsif ($action eq 'update') {
+       elsif ($action =~ /update/) {

                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }
                if (! -d $dir) {
                        return action("checkout", $dir, $topdir, $subdir);
                }


@@ -579,7 +579,8 @@ 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) {
+                       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: $!";
                                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: $!";


@@ -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);


@@ -897,6 +899,9 @@ lib =
                exit 1
        }
        hours_since() {
                exit 1
        }
        hours_since() {

+               if [ -z "$1" ] || [ -z "$2" ]; then
+                       error "mr: usage: hours_since action num"
+               fi

                for dir in .git .svn .bzr CVS .hg; do
                        if [ -e "$MR_REPO/$dir" ]; then
                                flagfile="$MR_REPO/$dir/.mr_last$1"
                for dir in .git .svn .bzr CVS .hg; do
                        if [ -e "$MR_REPO/$dir" ]; then
                                flagfile="$MR_REPO/$dir/.mr_last$1"


@@ -906,8 +911,13 @@ lib =
                if [ -z "$flagfile" ]; then
                        error "cannot determine flag filename"
                fi
                if [ -z "$flagfile" ]; then
                        error "cannot determine flag filename"
                fi

-               perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile"
-               touch "$flagfile"
+               delta=$(perl -wle 'print -f shift() ? int((-M _) * 24) : 9999' "$flagfile")
+               if [ "$delta" -lt "$2" ]; then
+                       exit 0
+               else
+                       touch "$flagfile"
+                       exit 1
+               fi

        }
 
 update =
        }
 
 update =