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, $require_quit);
11 &Getopt::Long::Configure('bundling');
13 'no-cvs|n' => \$no_cvs,
14 'failures-only|f' => \$failures_only,
15 'minor-updates|u' => \$minor_updates,
16 'prepare-source|p' => \$prepare_source,
17 'require-quit|Q' => \$require_quit,
18 'auto-cmd|a=s' => sub { $auto_cmd .= "|$_[1]" },
21 $auto_cmd =~ s/none\|//;
22 $auto_cmd = qr/^($auto_cmd)$/i;
24 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
26 chdir('patches') if -d 'patches';
28 if (!-f 'verify-patches') {
30 Please run this script from the root of the rsync dir or
31 from inside the patches subdir.
38 my($has_dependencies, @new, @rejects);
42 system "rsync -a --del cvsdir/ workdir/" if -d 'cvsdir';
46 open(IN, '../CVS/Root') or die $!;
50 mkdir('tmp', 0777) unless -d 'tmp';
51 chdir('tmp') or die "Unable to chdir to 'tmp'";
53 mkdir('workdir') unless -d 'workdir';
54 open(OUT, '>exclude') or die $!;
55 print OUT join("\n", 'CVS', @generated_files), "\n";
59 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
60 system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
63 @ARGV = glob('../*.diff') unless @ARGV;
66 foreach my $diff (@ARGV) {
67 next unless $diff =~ /\.diff$/;
68 next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/;
69 $diff =~ s#^(patches|\.\.)/##;
72 open(IN, "../$diff") or die $!;
75 if (/^Depends-On-Patch: (\S+.diff)$/) {
77 $has_dependencies = 1;
78 print "\nApplying dependency patch $dep...\n";
79 if (system("patch -d cvsdir -p1 -b -Vt <../$dep") != 0) {
80 print "Unable to cleanly apply dependency patch -- skipping $diff\n";
81 system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
85 sleep(1) if $prepare_source; # Ensure later diffs get later times.
87 if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
89 $conf_opts =~ s/\s+\(.*?\)//;
93 $conf_opts = '' unless defined $conf_opts;
95 my $default = apply_patch($diff);
97 if ($prepare_source) {
98 print "\nPreparing the source...\n";
99 chdir('workdir') or die $!;
100 system "./prepare-source";
101 chdir('..') or die $!;
104 if ($default =~ s/^D,// || $default eq 'N') {
105 my $def = generate_new_patch($diff);
106 $default = 'U,N' if $default eq 'N' && $def eq 'E';
107 $default = 'N' if !$minor_updates && $default eq 'U,N';
112 print "\n----------- $diff ------------\n",
113 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
114 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
116 if ($default =~ /$auto_cmd/) {
117 print $default, "\n";
121 $ans = $input if $input ne '';
123 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
126 $cmd = $2 || $ENV{'SHELL'};
127 chdir('workdir') or die $!;
129 chdir('..') or die $!;
134 $default = apply_patch($diff);
138 chdir('workdir') or die $!;
139 system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
140 chdir('..') or die $!;
141 $default = '!make test';
145 $default = generate_new_patch($diff);
149 chdir('workdir') or die $!;
150 system "vim -d ../../$diff ../new.patch";
151 chdir('..') or die $!;
156 chdir('workdir') or die $!;
157 system "vim @rejects";
158 chdir('..') or die $!;
169 system "cp -p new.patch ../$diff";
170 print "\nUpdated $diff from new.patch\n";
180 while ($require_quit) {
181 print "\nType 'Q' to quit this session of verify-patches: ";
194 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
195 print "\nApplying patch $diff...\n";
197 my($saw_failure, $saw_offset, $saw_fuzz);
198 open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
202 if (s/^patching file //) {
203 push(@new, $_) unless -f "cvsdir/$_";
204 } elsif (s/.* saving rejects to file //) {
206 } elsif (/^Hunk #\d+ FAILED/) {
208 } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
209 $saw_fuzz ||= defined $1;
214 return 'F,D,E' if $saw_failure;
215 return 'D,E' if $saw_fuzz && !$failures_only;
216 return 'D,U,N' if $saw_offset && !$failures_only;
223 open(IN, '-|', $cmd) or die $!;
225 next if /^(diff -|Index: |Only in )/;
226 s#^\Q--- cvsdir/\E([^\t]+).*#--- old/$1#;
227 s#^\Q+++ workdir/\E([^\t]+).*#+++ new/$1#;
233 sub generate_new_patch
238 system "touch -r workdir/$_ cvsdir/$_";
240 open(IN, "../$diff") or die $!;
241 open(OUT, '>new.patch') or die $!;
247 &filter_diff('diff --exclude-from=exclude -upr cvsdir workdir');
248 if ($prepare_source) {
249 # These are not included in the diff above so that patch will give
250 # generated files a later timestamp than the source files.
251 foreach my $fn (@generated_files) {
252 &filter_diff("diff -up cvsdir/$fn workdir");
259 print "\nDiffing... ";
260 if (system("diff ../$diff new.patch >/dev/null") == 0) {
261 print "new patch is identical to old.\n";
264 print "New patch DIFFERS from old.\n";
270 return unless $has_dependencies;
271 $has_dependencies = 0;
273 chdir('cvsdir') or die $!;
274 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
276 ($fn = $_) =~ s/\.~1~$//;
286 chdir('..') or die $!;
292 Usage: $0 [OPTS] [DIFF-FILE...]
293 -a, --auto-cmd=REGEX If default_cmd =~ /^(REGEX)\$/, enter it automatically
294 -f, --failures-only Suggest skipping patches that don't have failing hunks
295 -n, --no-cvs Don't update tmp/cvsdir at the start of the run
296 -p, --prepare-source Run ./prepare-source and include generated files in diff
297 -Q, --require-quit Don't auto-exit at the end of the list
298 -u, --minor-updates Suggest 'U' for even minor changes in the diff