Simplified the prefix defines and made to work with the latest

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

diff --git a/verify-patches b/verify-patches
index 91eebbe..4b76220 100755 (executable)
--- a/verify-patches
+++ b/verify-patches
@@ -31,8 +31,9 @@ from inside the patches subdir.
 EOT
 }
 
+$ENV{'LC_COLLATE'} = 'C';
 $| = 1;
-my $CONF_OPTS = '-C';
+my $CONF_OPTS = '--cache-file=../config.cache';
 
 my($has_dependencies, @new, @rejects);
 
@@ -48,6 +49,7 @@ close IN;
 
 mkdir('tmp', 0777) unless -d 'tmp';
 chdir('tmp') or die "Unable to chdir to 'tmp'";
+symlink('..', 'patches') unless -d 'patches';
 
 mkdir('workdir') unless -d 'workdir';
 open(OUT, '>exclude') or die $!;
@@ -59,7 +61,7 @@ unless ($no_cvs) {
     system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
 }
 
-@ARGV = glob('../*.diff') unless @ARGV;
+@ARGV = glob('patches/*.diff') unless @ARGV;
 
 DIFF:
 foreach my $diff (@ARGV) {
@@ -68,14 +70,14 @@ foreach my $diff (@ARGV) {
     $diff =~ s#^(patches|\.\.)/##;
 
     my $conf_opts;
-    open(IN, "../$diff") or die $!;
+    open(IN, "patches/$diff") or die $!;
     while (<IN>) {
        last if /^--- /;
-       if (/^Depends-On-Patch: (\S+.diff)$/) {
+       if (m#^\s+patch -p1 <patches/(\S+.diff)# && $1 ne $diff) {
            my $dep = $1;
            $has_dependencies = 1;
            print "\nApplying dependency patch $dep...\n";
-           if (system("patch -d cvsdir -p1 -b -Vt <../$dep") != 0) {
+           if (system("patch -d cvsdir -p1 -b -Vt <patches/$dep") != 0) {
                print "Unable to cleanly apply dependency patch -- skipping $diff\n";
                system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
                &restore_cvsdir;
@@ -157,7 +159,7 @@ foreach my $diff (@ARGV) {
            }
            if ($cmd eq 'E') {
                chdir('workdir') or die $!;
-               system "vim -d ../../$diff ../new.patch";
+               system "vim -d ../patches/$diff ../new.patch";
                chdir('..') or die $!;
                $default = 'U,A,D';
                next;
@@ -176,7 +178,7 @@ foreach my $diff (@ARGV) {
                exit;
            }
            if ($cmd eq 'U') {
-               system "cp -p new.patch ../$diff";
+               system "cp -p new.patch patches/$diff";
                print "\nUpdated $diff from new.patch\n";
                $default = 'A';
                next;
@@ -198,8 +200,8 @@ sub apply_patch
     system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
     print "\nApplying patch $diff...\n";
     undef @rejects;
-    my($saw_failure, $saw_offset, $saw_fuzz);
-    open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
+    my($saw_offset, $saw_fuzz);
+    open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <patches/$diff |") or die $!;
     while (<IN>) {
        print $_;
        chomp;
@@ -207,15 +209,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';
@@ -241,19 +241,19 @@ sub generate_new_patch
     foreach (@new) {
        system "touch -r workdir/$_ cvsdir/$_";
     }
-    open(IN, "../$diff") or die $!;
+    open(IN, "patches/$diff") or die $!;
     open(OUT, '>new.patch') or die $!;
     while (<IN>) {
        last if /^--- /;
        print OUT $_;
     }
     close IN;
-    &filter_diff('diff --exclude-from=exclude -upr cvsdir workdir');
+    &filter_diff('diff --exclude-from=exclude -dupr cvsdir workdir');
     if ($prepare_source) {
        # These are not included in the diff above so that patch will give
        # generated files a later timestamp than the source files.
        foreach my $fn (@generated_files) {
-           &filter_diff("diff -up cvsdir/$fn workdir");
+           &filter_diff("diff -dup cvsdir/$fn workdir");
        }
     }
     close OUT;
@@ -261,7 +261,7 @@ sub generate_new_patch
        unlink("cvsdir/$_");
     }
     print "\nDiffing... ";
-    if (system("diff ../$diff new.patch >/dev/null") == 0) {
+    if (system("diff patches/$diff new.patch >/dev/null") == 0) {
        print "new patch is identical to old.\n";
        return 'N';
     }