6 my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 );
8 my($no_cvs, $failures_only, $minor_updates, $prepare_source);
10 &Getopt::Long::Configure('bundling');
12 'no-cvs|n' => \$no_cvs,
13 'failures-only|f' => \$failures_only,
14 'minor-updates|u' => \$minor_updates,
15 'prepare-source|p' => \$prepare_source,
18 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
20 chdir('patches') if -d 'patches';
22 if (!-f 'verify-patches') {
24 Please run this script from the root of the rsync dir or
25 from inside the patches subdir.
32 my($has_dependencies, @new, @rejects);
36 system "rsync -a --del cvsdir/ workdir/" if -d 'cvsdir';
40 open(IN, '../CVS/Root') or die $!;
44 mkdir('tmp', 0777) unless -d 'tmp';
45 chdir('tmp') or die "Unable to chdir to 'tmp'";
47 mkdir('workdir') unless -d 'workdir';
48 open(OUT, '>exclude') or die $!;
50 if (!$prepare_source) {
51 print OUT join("\n", @generated_files), "\n";
56 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
57 system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
60 @ARGV = glob('../*.diff') unless @ARGV;
63 foreach my $diff (@ARGV) {
64 next unless $diff =~ /\.diff$/;
65 next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/;
66 $diff =~ s#^(patches|\.\.)/##;
69 open(IN, "../$diff") or die $!;
72 if (/^Depends-On-Patch: (\S+.diff)$/) {
74 $has_dependencies = 1;
75 print "\nApplying dependency patch $dep...\n";
76 if (system("patch -d cvsdir -p1 -b -Vt <../$dep") != 0) {
77 print "Unable to cleanly apply dependency patch -- skipping $diff\n";
78 system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
83 if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
85 $conf_opts =~ s/\s+\(.*?\)//;
89 $conf_opts = '' unless defined $conf_opts;
91 my $default = apply_patch($diff);
93 if ($prepare_source) {
94 print "\nPreparing the source...\n";
95 chdir('workdir') or die $!;
96 system "./prepare-source";
97 chdir('..') or die $!;
100 if ($default =~ s/^D,// || $default eq 'N') {
101 my $def = generate_new_patch($diff);
102 $default = 'U,N' if $default eq 'N' && $def eq 'E';
103 $default = 'N' if !$minor_updates && $default eq 'U,N';
108 print "\n----------- $diff ------------\n",
109 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
110 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
113 $ans = $default if $ans eq '';
114 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
117 $cmd = $2 || $ENV{'SHELL'};
118 chdir('workdir') or die $!;
120 chdir('..') or die $!;
125 $default = apply_patch($diff);
129 chdir('workdir') or die $!;
130 system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
131 chdir('..') or die $!;
132 $default = '!make test';
136 $default = generate_new_patch($diff);
140 chdir('workdir') or die $!;
141 system "vim -d ../../$diff ../new.patch";
142 chdir('..') or die $!;
147 chdir('workdir') or die $!;
148 system "vim @rejects";
149 chdir('..') or die $!;
160 system "cp -p new.patch ../$diff";
161 print "\nUpdated $diff from new.patch\n";
179 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
180 print "\nApplying patch $diff...\n";
182 my($saw_failure, $saw_offset, $saw_fuzz);
183 open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
187 if (s/^patching file //) {
188 push(@new, $_) unless -f "cvsdir/$_";
189 } elsif (s/.* saving rejects to file //) {
191 } elsif (/^Hunk #\d+ FAILED/) {
193 } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
194 $saw_fuzz ||= defined $1;
199 return 'F,D,E' if $saw_failure;
200 return 'D,E' if $saw_fuzz && !$failures_only;
201 return 'D,U,N' if $saw_offset && !$failures_only;
205 sub generate_new_patch
210 system "touch -r workdir/$_ cvsdir/$_";
212 open(IN, "../$diff") or die $!;
213 open(OUT, '>new.patch') or die $!;
219 open(IN, 'diff --exclude-from=exclude -upr cvsdir workdir |') or die $!;
221 next if /^(diff -|Index: |Only in )/;
222 s#^\Q--- cvsdir/\E([^\t]+).*#--- old/$1#;
223 s#^\Q+++ workdir/\E([^\t]+).*#+++ new/$1#;
231 print "\nDiffing... ";
232 if (system("diff ../$diff new.patch >/dev/null") == 0) {
233 print "new patch is identical to old.\n";
236 print "New patch DIFFERS from old.\n";
242 return unless $has_dependencies;
243 $has_dependencies = 0;
245 chdir('cvsdir') or die $!;
246 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
248 ($fn = $_) =~ s/\.~1~$//;
258 chdir('..') or die $!;
264 Usage: $0 [OPTS] [DIFF-FILE...]
265 -f, --failures-only Suggest skipping patches that don't have failing hunks
266 -n, --no-cvs Don't update tmp/cvsdir at the start of the run
267 -p, --prepare-source Run ./prepare-source and include generated files in diff
268 -u, --minor-updates Suggest 'U' for even minor changes in the diff