| 1 | #!/usr/bin/perl |
| 2 | |
| 3 | use strict; |
| 4 | use Getopt::Long; |
| 5 | |
| 6 | my @generated_files = qw( proto.h configure config.h.in rsync.1 rsyncd.conf.5 ); |
| 7 | |
| 8 | my($no_cvs, $failures_only, $minor_updates, $prepare_source); |
| 9 | my @auto_cmds; |
| 10 | |
| 11 | &Getopt::Long::Configure('bundling'); |
| 12 | GetOptions( |
| 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]) }, |
| 18 | ) or &usage; |
| 19 | |
| 20 | $" = '|'; |
| 21 | my $auto_regex = @auto_cmds ? qr/^(@auto_cmds)$/i : qr/^never$/; |
| 22 | my $interesting_fuzz = $minor_updates ? '\d' : '[2-9]'; |
| 23 | $" = ' '; |
| 24 | |
| 25 | chdir('patches') if -d 'patches'; |
| 26 | |
| 27 | if (!-f 'verify-patches') { |
| 28 | die <<EOT; |
| 29 | Please run this script from the root of the rsync dir or |
| 30 | from inside the patches subdir. |
| 31 | EOT |
| 32 | } |
| 33 | |
| 34 | $| = 1; |
| 35 | my $CONF_OPTS = '-C'; |
| 36 | |
| 37 | my($has_dependencies, @new, @rejects); |
| 38 | |
| 39 | END { |
| 40 | &restore_cvsdir; |
| 41 | system "rsync -a --del cvsdir/ workdir/" if -d 'cvsdir'; |
| 42 | }; |
| 43 | |
| 44 | my $root; |
| 45 | open(IN, '../CVS/Root') or die $!; |
| 46 | chomp($root = <IN>); |
| 47 | close IN; |
| 48 | |
| 49 | mkdir('tmp', 0777) unless -d 'tmp'; |
| 50 | chdir('tmp') or die "Unable to chdir to 'tmp'"; |
| 51 | |
| 52 | mkdir('workdir') unless -d 'workdir'; |
| 53 | open(OUT, '>exclude') or die $!; |
| 54 | print OUT join("\n", 'CVS', @generated_files), "\n"; |
| 55 | close OUT; |
| 56 | |
| 57 | unless ($no_cvs) { |
| 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|; |
| 60 | } |
| 61 | |
| 62 | @ARGV = glob('../*.diff') unless @ARGV; |
| 63 | |
| 64 | DIFF: |
| 65 | foreach my $diff (@ARGV) { |
| 66 | next unless $diff =~ /\.diff$/; |
| 67 | next if $diff =~ /gzip-rsyncable[-_a-z]*\.diff$/; |
| 68 | $diff =~ s#^(patches|\.\.)/##; |
| 69 | |
| 70 | my $conf_opts; |
| 71 | open(IN, "../$diff") or die $!; |
| 72 | while (<IN>) { |
| 73 | last if /^--- /; |
| 74 | if (/^Depends-On-Patch: (\S+.diff)$/) { |
| 75 | my $dep = $1; |
| 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"; |
| 81 | &restore_cvsdir; |
| 82 | next DIFF; |
| 83 | } |
| 84 | sleep(1) if $prepare_source; # Ensure later diffs get later times. |
| 85 | } |
| 86 | if (!defined($conf_opts) && s#^\s+\./configure\s+##) { |
| 87 | chomp($conf_opts = $_); |
| 88 | $conf_opts =~ s/\s*\(.*?\)//; |
| 89 | } |
| 90 | } |
| 91 | close IN; |
| 92 | $conf_opts = '' unless defined $conf_opts; |
| 93 | |
| 94 | my $default = apply_patch($diff); |
| 95 | |
| 96 | if ($prepare_source) { |
| 97 | print "\nPreparing the source...\n"; |
| 98 | chdir('workdir') or die $!; |
| 99 | system "./prepare-source"; |
| 100 | chdir('..') or die $!; |
| 101 | } |
| 102 | |
| 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'; |
| 107 | } |
| 108 | |
| 109 | my $first_time = 1; |
| 110 | PROMPT: |
| 111 | while (1) { |
| 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] "; |
| 115 | my $ans = $default; |
| 116 | if ($first_time && $default =~ /$auto_regex/) { |
| 117 | print $default, "\n"; |
| 118 | } else { |
| 119 | my $input = <STDIN>; |
| 120 | chomp $input; |
| 121 | if ($input =~ s/^(-a|--auto-cmd=?)\s*//) { |
| 122 | push(@auto_cmds, $input eq '' ? $default : $input); |
| 123 | $" = '|'; |
| 124 | $auto_regex = qr/^(@auto_cmds)$/i; |
| 125 | $" = ' '; |
| 126 | next; |
| 127 | } |
| 128 | $ans = $input if $input ne ''; |
| 129 | } |
| 130 | $first_time = 0; |
| 131 | while ($ans =~ s/^\s*(!|\w)((?<!!)[^;,]*|[^;]*)[;,]?//) { |
| 132 | my $cmd = "\U$1\E"; |
| 133 | if ($cmd eq '!') { |
| 134 | $cmd = $2 || $ENV{'SHELL'}; |
| 135 | chdir('workdir') or die $!; |
| 136 | system $cmd; |
| 137 | chdir('..') or die $!; |
| 138 | $default = 'D'; |
| 139 | next; |
| 140 | } |
| 141 | if ($cmd eq 'A') { |
| 142 | $default = apply_patch($diff); |
| 143 | next; |
| 144 | } |
| 145 | if ($cmd eq 'B') { |
| 146 | chdir('workdir') or die $!; |
| 147 | my $cmd = "./prepare-source && ./configure $CONF_OPTS $conf_opts && make"; |
| 148 | print "Running: $cmd\n"; |
| 149 | system $cmd; |
| 150 | chdir('..') or die $!; |
| 151 | $default = '!make test'; |
| 152 | next; |
| 153 | } |
| 154 | if ($cmd eq 'D') { |
| 155 | $default = generate_new_patch($diff); |
| 156 | next; |
| 157 | } |
| 158 | if ($cmd eq 'E') { |
| 159 | chdir('workdir') or die $!; |
| 160 | system "vim -d ../../$diff ../new.patch"; |
| 161 | chdir('..') or die $!; |
| 162 | $default = 'U,A,D'; |
| 163 | next; |
| 164 | } |
| 165 | if ($cmd eq 'F') { |
| 166 | chdir('workdir') or die $!; |
| 167 | system "vim @rejects"; |
| 168 | chdir('..') or die $!; |
| 169 | $default = 'D,E'; |
| 170 | next; |
| 171 | } |
| 172 | if ($cmd eq 'N') { |
| 173 | last PROMPT; |
| 174 | } |
| 175 | if ($cmd eq 'Q') { |
| 176 | exit; |
| 177 | } |
| 178 | if ($cmd eq 'U') { |
| 179 | system "cp -p new.patch ../$diff"; |
| 180 | print "\nUpdated $diff from new.patch\n"; |
| 181 | $default = 'A'; |
| 182 | next; |
| 183 | } |
| 184 | } |
| 185 | } |
| 186 | |
| 187 | &restore_cvsdir; |
| 188 | } |
| 189 | |
| 190 | exit; |
| 191 | |
| 192 | |
| 193 | sub apply_patch |
| 194 | { |
| 195 | my($diff) = @_; |
| 196 | |
| 197 | undef @new; |
| 198 | system "rsync -a --delete --exclude='*~' cvsdir/ workdir/"; |
| 199 | print "\nApplying patch $diff...\n"; |
| 200 | undef @rejects; |
| 201 | my($saw_offset, $saw_fuzz); |
| 202 | open(IN, "patch -d workdir -p1 --no-backup-if-mismatch <../$diff |") or die $!; |
| 203 | while (<IN>) { |
| 204 | print $_; |
| 205 | chomp; |
| 206 | if (s/^patching file //) { |
| 207 | push(@new, $_) unless -f "cvsdir/$_"; |
| 208 | } elsif (s/.* saving rejects to file //) { |
| 209 | push(@rejects, $_); |
| 210 | } elsif (/^Hunk #\d+ succeeded at \d+( with fuzz $interesting_fuzz)?/o) { |
| 211 | $saw_fuzz ||= defined $1; |
| 212 | $saw_offset = 1; |
| 213 | } |
| 214 | } |
| 215 | close IN; |
| 216 | return 'F,D,E' if @rejects; |
| 217 | return 'D,E' if $saw_fuzz && !$failures_only; |
| 218 | return 'D,U,N' if $saw_offset && !$failures_only; |
| 219 | 'N'; |
| 220 | } |
| 221 | |
| 222 | sub filter_diff |
| 223 | { |
| 224 | my($cmd) = @_; |
| 225 | open(IN, '-|', $cmd) or die $!; |
| 226 | while (<IN>) { |
| 227 | next if /^(diff -|Index: |Only in )/; |
| 228 | s#^\Q--- cvsdir/\E([^\t]+).*#--- old/$1#; |
| 229 | s#^\Q+++ workdir/\E([^\t]+).*#+++ new/$1#; |
| 230 | print OUT $_; |
| 231 | } |
| 232 | close IN; |
| 233 | } |
| 234 | |
| 235 | sub generate_new_patch |
| 236 | { |
| 237 | my($diff) = @_; |
| 238 | |
| 239 | foreach (@new) { |
| 240 | system "touch -r workdir/$_ cvsdir/$_"; |
| 241 | } |
| 242 | open(IN, "../$diff") or die $!; |
| 243 | open(OUT, '>new.patch') or die $!; |
| 244 | while (<IN>) { |
| 245 | last if /^--- /; |
| 246 | print OUT $_; |
| 247 | } |
| 248 | close IN; |
| 249 | &filter_diff('diff --exclude-from=exclude -upr cvsdir workdir'); |
| 250 | if ($prepare_source) { |
| 251 | # These are not included in the diff above so that patch will give |
| 252 | # generated files a later timestamp than the source files. |
| 253 | foreach my $fn (@generated_files) { |
| 254 | &filter_diff("diff -up cvsdir/$fn workdir"); |
| 255 | } |
| 256 | } |
| 257 | close OUT; |
| 258 | foreach (@new) { |
| 259 | unlink("cvsdir/$_"); |
| 260 | } |
| 261 | print "\nDiffing... "; |
| 262 | if (system("diff ../$diff new.patch >/dev/null") == 0) { |
| 263 | print "new patch is identical to old.\n"; |
| 264 | return 'N'; |
| 265 | } |
| 266 | print "New patch DIFFERS from old.\n"; |
| 267 | 'E'; |
| 268 | } |
| 269 | |
| 270 | sub restore_cvsdir |
| 271 | { |
| 272 | return unless $has_dependencies; |
| 273 | $has_dependencies = 0; |
| 274 | |
| 275 | chdir('cvsdir') or die $!; |
| 276 | foreach (glob('*.~[1-9]~'), glob('*/*.~[1-9]~')) { |
| 277 | my $fn; |
| 278 | ($fn = $_) =~ s/\.~1~$//; |
| 279 | if ($fn eq $_) { |
| 280 | unlink($_); |
| 281 | } elsif (-r $_) { |
| 282 | rename($_, $fn); |
| 283 | } else { |
| 284 | unlink($_); |
| 285 | unlink($fn); |
| 286 | } |
| 287 | } |
| 288 | chdir('..') or die $!; |
| 289 | } |
| 290 | |
| 291 | sub usage |
| 292 | { |
| 293 | die <<EOT; |
| 294 | Usage: $0 [OPTS] [DIFF-FILE...] |
| 295 | -a, --auto-cmd=REGEX If default_cmd =~ /^(REGEX)\$/, enter it automatically |
| 296 | -f, --failures-only Suggest skipping patches that don't have failing hunks |
| 297 | -n, --no-cvs Don't update tmp/cvsdir at the start of the run |
| 298 | -p, --prepare-source Run ./prepare-source and include generated files in diff |
| 299 | -u, --minor-updates Suggest 'U' for even minor changes in the diff |
| 300 | EOT |
| 301 | } |