my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 );
my($no_cvs, $failures_only, $minor_updates, $prepare_source);
+my @auto_cmds;
&Getopt::Long::Configure('bundling');
GetOptions(
'failures-only|f' => \$failures_only,
'minor-updates|u' => \$minor_updates,
'prepare-source|p' => \$prepare_source,
+ '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';
EOT
}
+$ENV{'LC_COLLATE'} = 'C';
$| = 1;
my $CONF_OPTS = '-C';
}
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;
$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 = <STDIN>;
- chomp $ans;
- $ans = $default if $ans eq '';
+ my $ans = $default;
+ 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 '!') {
}
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;
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 $_;
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';
{
die <<EOT;
Usage: $0 [OPTS] [DIFF-FILE...]
+ -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