5 chdir('patches') if -d 'patches';
7 if (!-f 'verify-patches') {
9 Please run this script from the root of the rsync dir or
10 from inside the patches subdir.
18 my($has_dependencies, @new, @rejects);
22 system "rsync -a --delete cvsdir/ workdir/" if -d 'cvsdir';
26 open(IN, '../CVS/Root') or die $!;
30 mkdir('tmp', 0777) unless -d 'tmp';
31 chdir('tmp') or die "Unable to chdir to 'tmp'";
33 mkdir('workdir') unless -d 'workdir';
34 open(OUT, '>exclude') or die $!;
45 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
46 system qq|cvs -d "$root" co -d cvsdir rsync|;
48 @ARGV = glob('../*.diff') unless @ARGV;
51 foreach my $diff (@ARGV) {
52 next unless $diff =~ /\.diff$/;
53 next if $diff =~ /gzip-rsyncable\.diff$/;
54 $diff =~ s#^(patches|\.\.)/##;
56 open(IN, "../$diff") or die $!;
59 if (/^Depends-On-Patch: (\S+.diff)$/) {
61 $has_dependencies = 1;
62 print "\nApplying dependency patch $dep...\n";
63 if (system("patch -d cvsdir -p0 -b -Vt -Zf <../$dep") != 0) {
64 print "Unable to cleanly apply depenency patch -- skipping $diff\n";
72 my $default = apply_patch($diff);
73 if ($default eq 'N') {
74 generate_new_patch($diff);
79 print "\n----------- $diff ------------\n",
80 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
81 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
84 $ans = $default if $ans eq '';
85 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
88 $cmd = $2 || $ENV{'SHELL'};
89 chdir('workdir') or die $!;
91 chdir('..') or die $!;
96 $default = apply_patch($diff);
100 if (!-f 'workdir/Makefile') {
101 open(IN, '../../Makefile') or die $!;
102 open(OUT, '>workdir/Makefile') or die $!;
103 print OUT "srcdir=.\n\n";
115 chdir('workdir') or die $!;
116 system "make gen; ./configure $CONF_OPTS; make";
117 chdir('..') or die $!;
118 $default = '!make test';
122 $default = generate_new_patch($diff);
126 chdir('workdir') or die $!;
127 system "vim -d ../../$diff ../new.patch";
128 chdir('..') or die $!;
133 chdir('workdir') or die $!;
134 system "vim @rejects";
135 chdir('..') or die $!;
146 system "cp -p new.patch ../$diff";
147 print "\nUpdated $diff from new.patch\n";
166 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
167 print "\nApplying patch $diff...\n";
168 open(IN, "patch -d workdir -p0 --no-backup-if-mismatch -Zf <../$diff |") or die $!;
172 if (s/^patching file //) {
173 push(@new, $_) unless -f "cvsdir/$_";
174 } elsif (s/.* saving rejects to file //) {
176 } elsif (/^Hunk #\d+ FAILED/) {
178 } elsif (/^Hunk #\d+ succeeded/) {
179 $def = 'E' unless $def =~ /F/;
186 sub generate_new_patch
191 system "touch -r workdir/$_ cvsdir/$_";
193 open(IN, "../$diff") or die $!;
194 open(OUT, '>new.patch') or die $!;
200 open(IN, 'diff --exclude-from=exclude -upr cvsdir workdir |') or die $!;
202 next if /^(diff -|Index: |Only in )/;
203 s#^\Q--- cvsdir/\E#--- orig/#;
204 s#^\Q+++ workdir/\E#+++ #;
205 s#(\.000000000)? \+0000$##;
213 print "\nDiffing... ";
214 if (system("diff ../$diff new.patch >/dev/null") == 0) {
215 print "new patch is identical to old.\n";
218 print "New patch DIFFERS from old.\n";
224 return unless $has_dependencies;
225 $has_dependencies = 0;
227 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
229 ($fn = $_) =~ s/\.~1~$//;