1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
#!@PERL@
# -*- perl -*-
#
# recountdiff - recompute patch counts and offsets
# Copyright (C) 2002 Tim Waugh <twaugh@redhat.com>
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use Getopt::Std;
getopts('-:', \%opts);
if ($opts{'-'} && $opts{'-'} eq 'version') {
print "recountdiff - patchutils version @VERSION@\n";
exit 0;
}
if ($opts{'-'} && $opts{'-'} eq 'help') {
print "usage: recountdiff [FILE...]\n";
exit 0;
}
@line=<>;
# First pass: fix up the counts.
$i=-1;
$state=0;
$chunk_start = 0;
$orig=0;
$new=0;
$orig_offset=0;
$new_offset=0;
$misc="";
@off_lines = ();
while ($i < $#line) {
$i++;
$_=$line[$i];
if ($state == 0) {
# Looking for the start of a file change.
unless(/^--- /) {
next;
}
$state++;
} elsif ($state == 1) {
# Should be '+++ ...'.
unless (/^\+\+\+ /) {
if (/^--- /) { $state = 1; }
else { $state = 0; }
next;
}
$state++;
} elsif ($state == 2) {
# Start of chunk. Should be '@@ ...'
unless (/^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@(.*)$/) {
if (/^--- /) { $state = 1; }
else { $state = 0; }
next;
}
($orig_offset,$new_offset,$misc) = ($1,$3,$5);
$orig_offset++ if defined($2) and $2 == 0;
$new_offset++ if defined($4) and $4 == 0;
$state++;
$orig=0;
$new=0;
$chunk_start = $i + 1;
} elsif ($state == 3) {
# Counting lines.
my $spit = 0;
if (/^\s/ or /^$/) { $orig++; $new++; }
elsif (/^\+/) { $new++; }
elsif (/^-- $/) {
# Git signature line - end of patch content
$spit = 1;
}
elsif (/^-/) {
# Look out for new file changes.
if (/^--- /) {
if ($i+2 <= $#line) {
if ($line[$i+2] =~ /^@/) {
$spit = 1;
}
}
} else {
$orig++;
}
} elsif (/^\\/) { }
else {
$spit = 1;
}
$spit = 1 if ($i == $#line);
if ($spit) {
# Spit them out.
$chunk_start--;
$orig_offset-- if ($orig == 0);
$new_offset-- if ($new == 0);
$line[$chunk_start] = "@@ -$orig_offset";
$line[$chunk_start] .= ",$orig" if ($orig != 1);
$line[$chunk_start] .= " +$new_offset";
$line[$chunk_start] .= ",$new" if ($new != 1);
$line[$chunk_start] .= " @@" . "$misc\n";
push (@off_lines, $chunk_start);
if (/^@/) { $state = 2; $i--; }
else {
$state = 0;
$i--;
push (@off_lines, -1)
}
}
}
}
# Second pass: fix up the offsets.
$offset = 0;
foreach (@off_lines) {
if ($_ == -1) {
$offset = 0;
next;
}
$line[$_] =~ /^@@ -(\d+),?(\d+)? \+(\d+),?(\d+)? @@(.*)$/;
($ooff,$oc,$noff_orig,$nc,$misc) = ($1,$2,$3,$4,$5);
# Check for new file before applying defaults
$is_new_file = ($ooff == 0 && defined($oc) && $oc == 0);
# For new files, preserve oc=0; otherwise apply default
if (!$is_new_file) {
$oc = 1 unless defined($oc);
}
$nc = 1 unless defined($nc);
# For new files (ooff=0, original oc=0), preserve the original new offset
if ($is_new_file) {
$noff = $noff_orig + $offset;
} else {
$noff = $ooff + $offset;
# Don't adjust offset for new files (when ooff is 0 and oc is 0)
$noff++ if ($oc == 0 && $ooff != 0);
$noff-- if ($nc == 0);
}
$line[$_] = "@@ -$ooff";
$line[$_] .= ",$oc" if ($oc != 1);
$line[$_] .= " +$noff";
$line[$_] .= ",$nc" if ($nc != 1);
$line[$_] .= " @@" . "$misc\n";
$offset += $nc - $oc;
}
print @line;
|
