6 $" = '|'; # NOTE: we auto-join arrays using '|' instead of space!
8 my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 );
10 my($no_cvs, $failures_only, $minor_updates, $prepare_source);
13 &Getopt::Long::Configure('bundling');
15 'no-cvs|n' => \$no_cvs,
16 'failures-only|f' => \$failures_only,
17 'minor-updates|u' => \$minor_updates,
18 'prepare-source|p' => \$prepare_source,
19 'auto-cmd|a=s' => sub { push(@auto_cmds, $_[1]) },
22 my $auto_regex = @auto_cmds ? qr/^(@auto_cmds)$/i : qr/^never$/;
23 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
25 chdir('patches') if -d 'patches';
27 if (!-f 'verify-patches') {
29 Please run this script from the root of the rsync dir or
30 from inside the patches subdir.
37 my($has_dependencies, @new, @rejects);
41 system "rsync -a --del cvsdir/ workdir/" if -d 'cvsdir';
45 open(IN, '../CVS/Root') or die $!;
49 mkdir('tmp', 0777) unless -d 'tmp';
50 chdir('tmp') or die "Unable to chdir to 'tmp'";
52 mkdir('workdir') unless -d 'workdir';
53 open(OUT, '>exclude') or die $!;
54 print OUT join("\n", 'CVS', @generated_files), "\n";
58 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
59 system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
62 @ARGV = glob('../*.diff') unless @ARGV;
65 foreach my $diff (@ARGV) {
66 next unless $diff =~ /\.diff$/;
67 next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/;
68 $diff =~ s#^(patches|\.\.)/##;
71 open(IN, "../$diff") or die $!;
74 if (/^Depends-On-Patch: (\S+.diff)$/) {
76 $has_dependencies = 1;
77 print "\nApplying dependency patch $dep...\n";
78 if (system("patch -d cvsdir -p1 -b -Vt <../$dep") != 0) {
79 print "Unable to cleanly apply dependency patch -- skipping $diff\n";
80 system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
84 sleep(1) if $prepare_source; # Ensure later diffs get later times.
86 if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
88 $conf_opts =~ s/\s+\(.*?\)//;
92 $conf_opts = '' unless defined $conf_opts;
94 my $default = apply_patch($diff);
96 if ($prepare_source) {
97 print "\nPreparing the source...\n";
98 chdir('workdir') or die $!;
99 system "./prepare-source";
100 chdir('..') or die $!;
103 if ($default =~ s/^D,// || $default eq 'N') {
104 my $def = generate_new_patch($diff);
105 $default = 'U,N' if $default eq 'N' && $def eq 'E';
106 $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 ($first_time && $default =~ /$auto_regex/) {
117 print $default, "\n";
121 if ($input =~ s/^(-a|--auto-cmd=?)\s*//) {
122 push(@auto_cmds, $input eq '' ? $default : $input);
123 $auto_regex = qr/^(@auto_cmds)$/i;
126 $ans = $input if $input ne '';
129 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
132 $cmd = $2 || $ENV{'SHELL'};
133 chdir('workdir') or die $!;
135 chdir('..') or die $!;
140 $default = apply_patch($diff);
144 chdir('workdir') or die $!;
145 system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
146 chdir('..') or die $!;
147 $default = '!make test';
151 $default = generate_new_patch($diff);
155 chdir('workdir') or die $!;
156 system "vim -d ../../$diff ../new.patch";
157 chdir('..') or die $!;
162 chdir('workdir') or die $!;
163 system "vim @rejects";
164 chdir('..') or die $!;
175 system "cp -p new.patch ../$diff";
176 print "\nUpdated $diff from new.patch\n";
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 -u, --minor-updates Suggest 'U' for even minor changes in the diff