A patch from Antti Tapaninen.

[rsync/rsync-patches.git] / verify-patches

diff --git a/verify-patches b/verify-patches
index 2fafc9d..807c584 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -5,8 +5,8 @@ use Getopt::Long;
 
 my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 );
 
-my($no_cvs, $failures_only, $minor_updates, $prepare_source, $require_quit);
-my $auto_cmd = 'never';
+my($no_cvs, $failures_only, $minor_updates, $prepare_source);
+my @auto_cmds;
 
 &Getopt::Long::Configure('bundling');
 GetOptions(
@@ -14,11 +14,13 @@ GetOptions(
     'failures-only|f' => \$failures_only,
     'minor-updates|u' => \$minor_updates,
     'prepare-source|p' => \$prepare_source,
-    'require-quit|Q' => \$require_quit,
-    'auto-cmd=s' => \$auto_cmd,
+    'auto-cmd|a=s' => sub { push(@auto_cmds, $_[1]) },
 ) or &usage;
 
+$" = '|';
+my $auto_regex = @auto_cmds ? qr/^(@auto_cmds)$/i : qr/^never$/;
 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
+$" = ' ';
 
 chdir('patches') if -d 'patches';
 
@@ -29,6 +31,7 @@ from inside the patches subdir.
 EOT
 }
 
+$ENV{'LC_COLLATE'} = 'C';
 $| = 1;
 my $CONF_OPTS = '-C';
 
@@ -81,9 +84,9 @@ foreach my $diff (@ARGV) {
            }
            sleep(1) if $prepare_source; # Ensure later diffs get later times.
        }
-       if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
-           $conf_opts = $1;
-           $conf_opts =~ s/\s+\(.*?\)//;
+       if (!defined($conf_opts) && s#^\s+\./configure\s+##) {
+           chomp($conf_opts = $_);
+           $conf_opts =~ s/\s*\(.*?\)//;
        }
     }
     close IN;
@@ -104,19 +107,28 @@ foreach my $diff (@ARGV) {
        $default = 'N' if !$minor_updates && $default eq 'U,N';
     }
 
+    my $first_time = 1;
     PROMPT:
     while (1) {
        print "\n----------- $diff ------------\n",
            "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
            "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
        my $ans = $default;
-       if ($default eq $auto_cmd) {
+       if ($first_time && $default =~ /$auto_regex/) {
            print $default, "\n";
        } else {
            my $input = <STDIN>;
            chomp $input;
+           if ($input =~ s/^(-a|--auto-cmd=?)\s*//) {
+               push(@auto_cmds, $input eq '' ? $default : $input);
+               $" = '|';
+               $auto_regex = qr/^(@auto_cmds)$/i;
+               $" = ' ';
+               next;
+           }
            $ans = $input if $input ne '';
        }
+       $first_time = 0;
        while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
            my $cmd = "\U$1\E";
            if ($cmd eq '!') {
@@ -133,7 +145,9 @@ foreach my $diff (@ARGV) {
            }
            if ($cmd eq 'B') {
                chdir('workdir') or die $!;
-               system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
+               my $cmd = "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
+               print "Running: $cmd\n";
+               system $cmd;
                chdir('..') or die $!;
                $default = '!make test';
                next;
@@ -174,12 +188,6 @@ foreach my $diff (@ARGV) {
     &restore_cvsdir;
 }
 
-while ($require_quit) {
-    print "\nType 'Q' to quit: ";
-    $_ = <STDIN>;
-    exit if /^q/i;
-}
-
 exit;
 
 
@@ -191,7 +199,7 @@ sub apply_patch
     system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
     print "\nApplying patch $diff...\n";
     undef @rejects;
-    my($saw_failure, $saw_offset, $saw_fuzz);
+    my($saw_offset, $saw_fuzz);
     open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
     while (<IN>) {
        print $_;
@@ -200,15 +208,13 @@ sub apply_patch
            push(@new, $_) unless -f "cvsdir/$_";
        } elsif (s/.* saving rejects to file //) {
            push(@rejects, $_);
-       } elsif (/^Hunk #\d+ FAILED/) {
-           $saw_failure = 1;
        } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
            $saw_fuzz ||= defined $1;
            $saw_offset = 1;
        }
     }
     close IN;
-    return 'F,D,E' if $saw_failure;
+    return 'F,D,E' if @rejects;
     return 'D,E' if $saw_fuzz && !$failures_only;
     return 'D,U,N' if $saw_offset && !$failures_only;
     'N';
@@ -287,11 +293,10 @@ sub usage
 {
     die <<EOT;
 Usage: $0 [OPTS] [DIFF-FILE...]
-     --auto-cmd=STR    If the suggested command is STR, enter it automatically
+ -a, --auto-cmd=REGEX  If default_cmd =~ /^(REGEX)\$/, enter it automatically
  -f, --failures-only   Suggest skipping patches that don't have failing hunks
  -n, --no-cvs          Don't update tmp/cvsdir at the start of the run
  -p, --prepare-source  Run ./prepare-source and include generated files in diff
- -Q, --require-quit    Don't auto-exit at the end of the list
  -u, --minor-updates   Suggest 'U' for even minor changes in the diff
 EOT
 }