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);
9 my $auto_cmd = 'never';
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=s' => \$auto_cmd,
21 my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]';
23 chdir('patches') if -d 'patches';
25 if (!-f 'verify-patches') {
27 Please run this script from the root of the rsync dir or
28 from inside the patches subdir.
35 my($has_dependencies, @new, @rejects);
39 system "rsync -a --del cvsdir/ workdir/" if -d 'cvsdir';
43 open(IN, '../CVS/Root') or die $!;
47 mkdir('tmp', 0777) unless -d 'tmp';
48 chdir('tmp') or die "Unable to chdir to 'tmp'";
50 mkdir('workdir') unless -d 'workdir';
51 open(OUT, '>exclude') or die $!;
52 print OUT join("\n", 'CVS', @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";
82 sleep(1) if $prepare_source; # Ensure later diffs get later times.
84 if (!defined($conf_opts) && m#^\s*\./configure( .+)#) {
86 $conf_opts =~ s/\s+\(.*?\)//;
90 $conf_opts = '' unless defined $conf_opts;
92 my $default = apply_patch($diff);
94 if ($prepare_source) {
95 print "\nPreparing the source...\n";
96 chdir('workdir') or die $!;
97 system "./prepare-source";
98 chdir('..') or die $!;
101 if ($default =~ s/^D,// || $default eq 'N') {
102 my $def = generate_new_patch($diff);
103 $default = 'U,N' if $default eq 'N' && $def eq 'E';
104 $default = 'N' if !$minor_updates && $default eq 'U,N';
109 print "\n----------- $diff ------------\n",
110 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
111 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
113 if ($default eq $auto_cmd) {
114 print $default, "\n";
118 $ans = $input if $input ne '';
120 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
123 $cmd = $2 || $ENV{'SHELL'};
124 chdir('workdir') or die $!;
126 chdir('..') or die $!;
131 $default = apply_patch($diff);
135 chdir('workdir') or die $!;
136 system "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
137 chdir('..') or die $!;
138 $default = '!make test';
142 $default = generate_new_patch($diff);
146 chdir('workdir') or die $!;
147 system "vim -d ../../$diff ../new.patch";
148 chdir('..') or die $!;
153 chdir('workdir') or die $!;
154 system "vim @rejects";
155 chdir('..') or die $!;
166 system "cp -p new.patch ../$diff";
167 print "\nUpdated $diff from new.patch\n";
177 while ($require_quit) {
178 print "\nType 'Q' to quit: ";
191 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
192 print "\nApplying patch $diff...\n";
194 my($saw_failure, $saw_offset, $saw_fuzz);
195 open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!;
199 if (s/^patching file //) {
200 push(@new, $_) unless -f "cvsdir/$_";
201 } elsif (s/.* saving rejects to file //) {
203 } elsif (/^Hunk #\d+ FAILED/) {
205 } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
206 $saw_fuzz ||= defined $1;
211 return 'F,D,E' if $saw_failure;
212 return 'D,E' if $saw_fuzz && !$failures_only;
213 return 'D,U,N' if $saw_offset && !$failures_only;
220 open(IN, '-|', $cmd) or die $!;
222 next if /^(diff -|Index: |Only in )/;
223 s#^\Q--- cvsdir/\E([^\t]+).*#--- old/$1#;
224 s#^\Q+++ workdir/\E([^\t]+).*#+++ new/$1#;
230 sub generate_new_patch
235 system "touch -r workdir/$_ cvsdir/$_";
237 open(IN, "../$diff") or die $!;
238 open(OUT, '>new.patch') or die $!;
244 &filter_diff('diff --exclude-from=exclude -upr cvsdir workdir');
245 if ($prepare_source) {
246 # These are not included in the diff above so that patch will give
247 # generated files a later timestamp than the source files.
248 foreach my $fn (@generated_files) {
249 &filter_diff("diff -up cvsdir/$fn workdir");
256 print "\nDiffing... ";
257 if (system("diff ../$diff new.patch >/dev/null") == 0) {
258 print "new patch is identical to old.\n";
261 print "New patch DIFFERS from old.\n";
267 return unless $has_dependencies;
268 $has_dependencies = 0;
270 chdir('cvsdir') or die $!;
271 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
273 ($fn = $_) =~ s/\.~1~$//;
283 chdir('..') or die $!;
289 Usage: $0 [OPTS] [DIFF-FILE...]
290 --auto-cmd=STR If the suggested command is STR, enter it automatically
291 -f, --failures-only Suggest skipping patches that don't have failing hunks
292 -n, --no-cvs Don't update tmp/cvsdir at the start of the run
293 -p, --prepare-source Run ./prepare-source and include generated files in diff
294 -Q, --require-quit Don't auto-exit at the end of the list
295 -u, --minor-updates Suggest 'U' for even minor changes in the diff