patch-range.pl (3713B)
1 #!/usr/bin/env perl 2 3 use strict; 4 use warnings; 5 6 my $print_remaining = 0; 7 if ($ARGV[0] eq "-print-remaining-diff") { 8 $print_remaining = 1; 9 shift @ARGV; 10 } 11 12 my $line_number_kind = "diff"; 13 if ($ARGV[0] eq "-line-numbers-from-new-file") { 14 $line_number_kind = "new-file"; 15 shift @ARGV; 16 } 17 18 my $min_line = $ARGV[0]; 19 shift @ARGV; 20 my $max_line = $ARGV[0]; 21 shift @ARGV; 22 23 my $patch_cmd; 24 if (defined $ARGV[0] and $ARGV[0] =~ m{^[^-]}) { 25 $patch_cmd = "@ARGV"; 26 } else { 27 $patch_cmd = "patch @ARGV"; 28 } 29 my $reverse = grep /^(--reverse|-R)$/, @ARGV; 30 31 my $lineno = $line_number_kind eq "diff" ? 0 : undef; 32 my $original = ""; 33 my $diff_header = ""; 34 my $wheat = ""; 35 my $chaff = "" if $print_remaining; 36 my $state = undef; 37 my $hunk_wheat = undef; 38 my $hunk_chaff = undef if $print_remaining; 39 my $hunk_header = undef; 40 my $hunk_remaining_lines = undef; 41 my $signature = "" if $print_remaining; 42 43 sub compute_hunk_header { 44 my $original_header = shift; 45 my $hunk = shift; 46 my $old_lines = 0; 47 my $new_lines = 0; 48 for (split /\n/, $hunk) { 49 $old_lines++ if m{^[ -]}; 50 $new_lines++ if m{^[ +]}; 51 } 52 my $updated_header = $original_header =~ s/^@@ -(\d+),\d+\s+\+(\d+),\d+ @@(.*)/@@ -$1,$old_lines +$2,$new_lines @\@$3/mr; 53 return $updated_header; 54 } 55 56 sub finish_hunk { 57 return unless defined $hunk_header; 58 if ($hunk_wheat =~ m{^[-+]}m) { 59 if ($diff_header) { 60 $wheat .= $diff_header; 61 $diff_header = ""; 62 } 63 $wheat .= (compute_hunk_header $hunk_header, $hunk_wheat). $hunk_wheat; 64 } 65 if ($print_remaining) { 66 $chaff .= (compute_hunk_header $hunk_header, $hunk_chaff) . $hunk_chaff . $signature; 67 } 68 $hunk_header = undef; 69 } 70 71 while (<STDIN>) { 72 ++$lineno if $line_number_kind eq "diff"; 73 $original .= $_; 74 if (m{^diff} || (not defined $state and m{^---})) { 75 finish_hunk(); 76 $state = "diff header"; 77 $diff_header = ""; 78 } 79 if ($state eq "signature") { 80 $signature .= $_ if $print_remaining; 81 next; 82 } 83 if (m{^@@ -\d+(?:,(\d)+)? \+(\d+)(?:,\d+)? @@}) { 84 $lineno = $2 - 1 if $line_number_kind eq "new-file"; 85 $hunk_remaining_lines = $1 or 1; 86 finish_hunk(); 87 $state = "diff hunk"; 88 $hunk_header = $_; 89 $hunk_wheat = ""; 90 if ($print_remaining) { 91 $hunk_chaff = ""; 92 $signature = ""; 93 } 94 next; 95 } 96 if ($state eq "diff header") { 97 $diff_header .= $_; 98 $chaff .= $_ if $print_remaining; 99 next; 100 } 101 if ($hunk_remaining_lines == 0 and m{^-- $}) { 102 $state = "signature"; 103 $signature .= $_ if $print_remaining; 104 next; 105 } 106 ++$lineno if $line_number_kind eq "new-file" && m{^[ +]}; 107 --$hunk_remaining_lines if m{^[ -]}; 108 my $include = m{^ } || 109 ($lineno >= $min_line && $lineno <= $max_line) || 110 ($line_number_kind eq "new-file" && m{^-} && $lineno == $min_line - 1); 111 if ($include) { 112 $hunk_wheat .= $_; 113 if ($print_remaining) { 114 $hunk_chaff .= $_ if m{^ }; 115 if ($reverse ? m{^[-]} : m{^\+}) { 116 $hunk_chaff .= " " . substr $_, 1; 117 } 118 } 119 } else { 120 if ($reverse ? m{^\+} : m{^-}) { 121 $hunk_wheat .= " " . substr $_, 1; 122 } 123 $hunk_chaff .= $_ if $print_remaining; 124 } 125 } 126 finish_hunk(); 127 128 open PATCH_COMMAND, "|-", "$patch_cmd" or die "patch-range.pl: error running '$patch_cmd': $!"; 129 print PATCH_COMMAND $wheat; 130 if (not close PATCH_COMMAND) { 131 print $original; 132 print STDERR "patch-range.pl: error running:\n" . "\$ $patch_cmd << EOF\n$wheat" . "EOF\n"; 133 exit 1; 134 } 135 print $chaff if $print_remaining;