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);
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 'auto-cmd|a=s' => sub { push(@auto_cmds, $_[1]) },
21 my $auto_regex = @auto_cmds ? qr/^(@auto_cmds)$/i : qr/^never$/;
22 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.
34 $ENV{'LC_COLLATE'} = 'C';
36 my $CONF_OPTS = '--cache-file=../config.cache';
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'";
52 symlink('..', 'patches') unless -d 'patches';
54 mkdir('workdir') unless -d 'workdir';
55 open(OUT, '>exclude') or die $!;
56 print OUT join("\n", 'CVS', @generated_files), "\n";
60 print "Using CVS to update the tmp/cvsdir copy of the source.\n";
61 system qq|cvs -qd "$root" co -P -d cvsdir rsync|;
64 @ARGV = glob('patches/*.diff') unless @ARGV;
67 foreach my $diff (@ARGV) {
68 next unless $diff =~ /\.diff$/;
69 next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/;
70 $diff =~ s#^(patches|\.\.)/##;
73 open(IN, "patches/$diff") or die $!;
76 if (m#^\s+patch -p1 <patches/(\S+.diff)# && $1 ne $diff) {
78 $has_dependencies = 1;
79 print "\nApplying dependency patch $dep...\n";
80 if (system("patch -d cvsdir -p1 -b -Vt <patches/$dep") != 0) {
81 print "Unable to cleanly apply dependency patch -- skipping $diff\n";
82 system "rm -f cvsdir/*.rej cvsdir/*/*.rej";
86 sleep(1) if $prepare_source; # Ensure later diffs get later times.
88 if (!defined($conf_opts) && s#^\s+\./configure\s+##) {
89 chomp($conf_opts = $_);
90 $conf_opts =~ s/\s*\(.*?\)//;
94 $conf_opts = '' unless defined $conf_opts;
96 my $default = apply_patch($diff);
98 if ($prepare_source) {
99 print "\nPreparing the source...\n";
100 chdir('workdir') or die $!;
101 system "./prepare-source";
102 chdir('..') or die $!;
105 if ($default =~ s/^D,// || $default eq 'N') {
106 my $def = generate_new_patch($diff);
107 $default = 'U,N' if $default eq 'N' && $def eq 'E';
108 $default = 'N' if !$minor_updates && $default eq 'U,N';
114 print "\n----------- $diff ------------\n",
115 "\nFix rejects, Diff create, Edit both diffs, Update patch,\n",
116 "Apply patch again, !(CMD), Build rsync, Next, Quit: [$default] ";
118 if ($first_time && $default =~ /$auto_regex/) {
119 print $default, "\n";
123 if ($input =~ s/^(-a|--auto-cmd=?)\s*//) {
124 push(@auto_cmds, $input eq '' ? $default : $input);
126 $auto_regex = qr/^(@auto_cmds)$/i;
130 $ans = $input if $input ne '';
133 while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) {
136 $cmd = $2 || $ENV{'SHELL'};
137 chdir('workdir') or die $!;
139 chdir('..') or die $!;
144 $default = apply_patch($diff);
148 chdir('workdir') or die $!;
149 my $cmd = "./prepare-source && ./configure $CONF_OPTS $conf_opts && make";
150 print "Running: $cmd\n";
152 chdir('..') or die $!;
153 $default = '!make test';
157 $default = generate_new_patch($diff);
161 chdir('workdir') or die $!;
162 system "vim -d ../patches/$diff ../new.patch";
163 chdir('..') or die $!;
168 chdir('workdir') or die $!;
169 system "vim @rejects";
170 chdir('..') or die $!;
181 system "cp -p new.patch patches/$diff";
182 print "\nUpdated $diff from new.patch\n";
200 system "rsync -a --delete --exclude='*~' cvsdir/ workdir/";
201 print "\nApplying patch $diff...\n";
203 my($saw_offset, $saw_fuzz);
204 open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <patches/$diff |") or die $!;
208 if (s/^patching file //) {
209 push(@new, $_) unless -f "cvsdir/$_";
210 } elsif (s/.* saving rejects to file //) {
212 } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) {
213 $saw_fuzz ||= defined $1;
218 return 'F,D,E' if @rejects;
219 return 'D,E' if $saw_fuzz && !$failures_only;
220 return 'D,U,N' if $saw_offset && !$failures_only;
227 open(IN, '-|', $cmd) or die $!;
229 next if /^(diff -|Index: |Only in )/;
230 s#^\Q--- cvsdir/\E([^\t]+).*#--- old/$1#;
231 s#^\Q+++ workdir/\E([^\t]+).*#+++ new/$1#;
237 sub generate_new_patch
242 system "touch -r workdir/$_ cvsdir/$_";
244 open(IN, "patches/$diff") or die $!;
245 open(OUT, '>new.patch') or die $!;
251 &filter_diff('diff --exclude-from=exclude -dupr cvsdir workdir');
252 if ($prepare_source) {
253 # These are not included in the diff above so that patch will give
254 # generated files a later timestamp than the source files.
255 foreach my $fn (@generated_files) {
256 &filter_diff("diff -dup cvsdir/$fn workdir");
263 print "\nDiffing... ";
264 if (system("diff patches/$diff new.patch >/dev/null") == 0) {
265 print "new patch is identical to old.\n";
268 print "New patch DIFFERS from old.\n";
274 return unless $has_dependencies;
275 $has_dependencies = 0;
277 chdir('cvsdir') or die $!;
278 foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) {
280 ($fn = $_) =~ s/\.~1~$//;
290 chdir('..') or die $!;
296 Usage: $0 [OPTS] [DIFF-FILE...]
297 -a, --auto-cmd=REGEX If default_cmd =~ /^(REGEX)\$/, enter it automatically
298 -f, --failures-only Suggest skipping patches that don't have failing hunks
299 -n, --no-cvs Don't update tmp/cvsdir at the start of the run
300 -p, --prepare-source Run ./prepare-source and include generated files in diff
301 -u, --minor-updates Suggest 'U' for even minor changes in the diff