6 my %generated_files = (
7 'proto.h' => qr#\.[ch]$#,
8 'configure' => qr#^(configure\.in|aclocal\.m4)$#,
9 'config.h.in' => qr#^(configure\.in|aclocal\.m4)$#,
10 'rsync.1' => qr#^rsync\.yo$#,
11 'rsyncd.conf.5' => qr#^rsyncd\.conf\.yo$#,
14 my($no_cvs, $failures_only, $minor_updates, $prepare_source);
16 &Getopt::Long::Configure('bundling');
18 'no-cvs|n' => \$no_cvs,
19 'failures-only|f' => \$failures_only,
20 'minor-updates|u' => \$minor_updates,
21 'prepare-source|p' => \$prepare_source,
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.
39 my($has_dependencies, @new, @rejects);
43 system "rsync -a --delete cvsdir/ workdir/" if -d 'cvsdir';
47 open(IN, '../CVS/Root') or die $!;
51 mkdir('tmp', 0777) unless -d 'tmp';
52 chdir('tmp') or die "Unable to chdir to 'tmp'";
54 mkdir('workdir') unless -d 'workdir';
55 open(OUT, '>exclude') or die $!;
57 if (!$prepare_source) {
58 print OUT join("\n", sort keys %generated_files), "\n";
63 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
64 system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
67 @ARGV = glob('../*.diff') unless @ARGV;
70 foreach my $diff (@ARGV) {
71 next unless $diff =~ /\.diff$/;
72 next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/;
73 $diff =~ s#^(patches|\.\.)/##;
75 open(IN, "../$diff") or die $!;
78 if (/^Depends-On-Patch: (\S+.diff)$/) {
80 $has_dependencies = 1;
81 print "\nApplying dependency patch $dep...\n";
82 if (system("patch -d cvsdir -p0 -b -Vt -Zf <../$dep") != 0) {
83 print "Unable to cleanly apply dependency patch -- skipping $diff\n";
84 system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
92 my($conf_opts, %regenerate);
93 open(IN, "../$diff") or die $!;
95 if (!defined $conf_opts) {
96 if (m#^\s*\./configure( .+)#) {
98 $conf_opts =~ s/\s+\(.*?\)//;
103 if (m#^--- orig/([^\t]+)#) {
105 while (my($fn, $re) = each %generated_files) {
106 if ($patching =~ /$re/) {
107 $regenerate{$fn} = 1;
113 my @regenerate = sort keys %regenerate;
115 my $default = apply_patch($diff);
118 chdir('workdir') or die $!;
119 foreach (@regenerate) {
120 utime(111111111, 111111111, $_);
122 if ($prepare_source) {
123 print "\nRegenerating: @regenerate\n";
124 system "make -f prepare-source.mak @regenerate";
126 chdir('..') or die $!;
129 if ($default =~ s/^D,// || $default eq 'N') {
130 my $def = generate_new_patch($diff);
131 $default = 'U,N' if $default eq 'N' && $def eq 'E';
132 $default = 'N' if !$minor_updates && $default eq 'U,N';
137 print "\n----------- $diff ------------\n",
138 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
139 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
142 $ans = $default if $ans eq '';
143 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
146 $cmd = $2 || $ENV{'SHELL'};
147 chdir('workdir') or die $!;
149 chdir('..') or die $!;
154 $default = apply_patch($diff);
159 chdir('workdir') or die $!;
161 $regen = "make -f prepare-source.mak @regenerate && ";
165 system "$regen./configure $CONF_OPTS $conf_opts && make";
166 chdir('..') or die $!;
167 $default = '!make test';
171 $default = generate_new_patch($diff);
175 chdir('workdir') or die $!;
176 system "vim -d ../../$diff ../new.patch";
177 chdir('..') or die $!;
182 chdir('workdir') or die $!;
183 system "vim @rejects";
184 chdir('..') or die $!;
195 system "cp -p new.patch ../$diff";
196 print "\nUpdated $diff from new.patch\n";
214 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
215 print "\nApplying patch $diff...\n";
217 my($saw_failure, $saw_offset, $saw_fuzz);
218 open(IN, "patch -d workdir -p0 --no-backup-if-mismatch -Zf <../$diff |") or die $!;
222 if (s/^patching file //) {
223 push(@new, $_) unless -f "cvsdir/$_";
224 } elsif (s/.* saving rejects to file //) {
226 } elsif (/^Hunk #\d+ FAILED/) {
228 } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
229 $saw_fuzz ||= defined $1;
234 return 'F,D,E' if $saw_failure;
235 return 'D,E' if $saw_fuzz && !$failures_only;
236 return 'D,U,N' if $saw_offset && !$failures_only;
240 sub generate_new_patch
245 system "touch -r workdir/$_ cvsdir/$_";
247 open(IN, "../$diff") or die $!;
248 open(OUT, '>new.patch') or die $!;
254 open(IN, 'diff --exclude-from=exclude -upr cvsdir workdir |') or die $!;
256 next if /^(diff -|Index: |Only in )/;
257 s#^\Q--- cvsdir/\E#--- orig/#;
258 s#^\Q+++ workdir/\E#+++ #;
259 s#(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(\.\d\d\d\d\d\d\d\d\d)? \+0000$#$1#;
267 print "\nDiffing... ";
268 if (system("diff ../$diff new.patch >/dev/null") == 0) {
269 print "new patch is identical to old.\n";
272 print "New patch DIFFERS from old.\n";
278 return unless $has_dependencies;
279 $has_dependencies = 0;
281 chdir('cvsdir') or die $!;
282 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
284 ($fn = $_) =~ s/\.~1~$//;
294 chdir('..') or die $!;
300 Usage: $0 [OPTS] [DIFF-FILE...]
301 -f, --failures-only Suggest skipping patches that don't have failing hunks
302 -n, --no-cvs Don't update tmp/cvsdir at the start of the run
303 -p, --prepare-source Run ./prepare-source and include generated files in diff
304 -u, --minor-updates Suggest 'U' for even minor changes in the diff