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
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
|
/*
* Copyright (C) 2008-2009, Google Inc. and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.patch;
import static org.eclipse.jgit.util.RawParseUtils.match;
import static org.eclipse.jgit.util.RawParseUtils.nextLF;
import static org.eclipse.jgit.util.RawParseUtils.parseBase10;
import java.io.IOException;
import java.io.OutputStream;
import java.text.MessageFormat;
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.diff.EditList;
import org.eclipse.jgit.internal.JGitText;
import org.eclipse.jgit.lib.AbbreviatedObjectId;
import org.eclipse.jgit.util.MutableInteger;
/**
* Hunk header describing the layout of a single block of lines
*/
public class HunkHeader {
/** Details about an old image of the file. */
public abstract static class OldImage {
/** First line number the hunk starts on in this file. */
int startLine;
/** Total number of lines this hunk covers in this file. */
int lineCount;
/** Number of lines deleted by the post-image from this file. */
int nDeleted;
/** Number of lines added by the post-image not in this file. */
int nAdded;
/** @return first line number the hunk starts on in this file. */
public int getStartLine() {
return startLine;
}
/** @return total number of lines this hunk covers in this file. */
public int getLineCount() {
return lineCount;
}
/** @return number of lines deleted by the post-image from this file. */
public int getLinesDeleted() {
return nDeleted;
}
/** @return number of lines added by the post-image not in this file. */
public int getLinesAdded() {
return nAdded;
}
/** @return object id of the pre-image file. */
public abstract AbbreviatedObjectId getId();
}
final FileHeader file;
/** Offset within {@link #file}.buf to the "@@ -" line. */
final int startOffset;
/** Position 1 past the end of this hunk within {@link #file}'s buf. */
int endOffset;
private final OldImage old;
/** First line number in the post-image file where the hunk starts */
int newStartLine;
/** Total number of post-image lines this hunk covers (context + inserted) */
int newLineCount;
/** Total number of lines of context appearing in this hunk */
int nContext;
private EditList editList;
HunkHeader(FileHeader fh, int offset) {
this(fh, offset, new OldImage() {
@Override
public AbbreviatedObjectId getId() {
return fh.getOldId();
}
});
}
HunkHeader(FileHeader fh, int offset, OldImage oi) {
file = fh;
startOffset = offset;
old = oi;
}
HunkHeader(FileHeader fh, EditList editList) {
this(fh, fh.buf.length);
this.editList = editList;
endOffset = startOffset;
nContext = 0;
if (editList.isEmpty()) {
newStartLine = 0;
newLineCount = 0;
} else {
newStartLine = editList.get(0).getBeginB();
Edit last = editList.get(editList.size() - 1);
newLineCount = last.getEndB() - newStartLine;
}
}
/**
* Get header for the file this hunk applies to.
*
* @return header for the file this hunk applies to.
*/
public FileHeader getFileHeader() {
return file;
}
/**
* Get the byte array holding this hunk's patch script.
*
* @return the byte array holding this hunk's patch script.
*/
public byte[] getBuffer() {
return file.buf;
}
/**
* Get offset of the start of this hunk in {@link #getBuffer()}.
*
* @return offset of the start of this hunk in {@link #getBuffer()}.
*/
public int getStartOffset() {
return startOffset;
}
/**
* Get offset one past the end of the hunk in {@link #getBuffer()}.
*
* @return offset one past the end of the hunk in {@link #getBuffer()}.
*/
public int getEndOffset() {
return endOffset;
}
/**
* Get information about the old image mentioned in this hunk.
*
* @return information about the old image mentioned in this hunk.
*/
public OldImage getOldImage() {
return old;
}
/**
* Get first line number in the post-image file where the hunk starts.
*
* @return first line number in the post-image file where the hunk starts.
*/
public int getNewStartLine() {
return newStartLine;
}
/**
* Get total number of post-image lines this hunk covers.
*
* @return total number of post-image lines this hunk covers.
*/
public int getNewLineCount() {
return newLineCount;
}
/**
* Get total number of lines of context appearing in this hunk.
*
* @return total number of lines of context appearing in this hunk.
*/
public int getLinesContext() {
return nContext;
}
/**
* Convert to a list describing the content edits performed within the hunk.
*
* @return a list describing the content edits performed within the hunk.
*/
public EditList toEditList() {
if (editList == null) {
editList = new EditList();
final byte[] buf = file.buf;
int c = nextLF(buf, startOffset);
int oLine = old.startLine;
int nLine = newStartLine;
Edit in = null;
SCAN: for (; c < endOffset; c = nextLF(buf, c)) {
switch (buf[c]) {
case ' ':
case '\n':
in = null;
oLine++;
nLine++;
continue;
case '-':
if (in == null) {
in = new Edit(oLine - 1, nLine - 1);
editList.add(in);
}
oLine++;
in.extendA();
continue;
case '+':
if (in == null) {
in = new Edit(oLine - 1, nLine - 1);
editList.add(in);
}
nLine++;
in.extendB();
continue;
case '\\': // Matches "\ No newline at end of file"
continue;
default:
break SCAN;
}
}
}
return editList;
}
void parseHeader() {
// Parse "@@ -236,9 +236,9 @@ protected boolean"
//
final byte[] buf = file.buf;
final MutableInteger ptr = new MutableInteger();
ptr.value = nextLF(buf, startOffset, ' ');
old.startLine = -parseBase10(buf, ptr.value, ptr);
if (buf[ptr.value] == ',')
old.lineCount = parseBase10(buf, ptr.value + 1, ptr);
else
old.lineCount = 1;
newStartLine = parseBase10(buf, ptr.value + 1, ptr);
if (buf[ptr.value] == ',')
newLineCount = parseBase10(buf, ptr.value + 1, ptr);
else
newLineCount = 1;
}
int parseBody(Patch script, int end) {
final byte[] buf = file.buf;
int c = nextLF(buf, startOffset), last = c;
old.nDeleted = 0;
old.nAdded = 0;
SCAN: for (; c < end; last = c, c = nextLF(buf, c)) {
switch (buf[c]) {
case ' ':
case '\n':
nContext++;
continue;
case '-':
old.nDeleted++;
continue;
case '+':
old.nAdded++;
continue;
case '\\': // Matches "\ No newline at end of file"
continue;
default:
break SCAN;
}
}
if (last < end && nContext + old.nDeleted - 1 == old.lineCount
&& nContext + old.nAdded == newLineCount
&& match(buf, last, Patch.SIG_FOOTER) >= 0) {
// This is an extremely common occurrence of "corruption".
// Users add footers with their signatures after this mark,
// and git diff adds the git executable version number.
// Let it slide; the hunk otherwise looked sound.
//
old.nDeleted--;
return last;
}
if (nContext + old.nDeleted < old.lineCount) {
final int missingCount = old.lineCount - (nContext + old.nDeleted);
script.error(buf, startOffset, MessageFormat.format(
JGitText.get().truncatedHunkOldLinesMissing,
Integer.valueOf(missingCount)));
} else if (nContext + old.nAdded < newLineCount) {
final int missingCount = newLineCount - (nContext + old.nAdded);
script.error(buf, startOffset, MessageFormat.format(
JGitText.get().truncatedHunkNewLinesMissing,
Integer.valueOf(missingCount)));
} else if (nContext + old.nDeleted > old.lineCount
|| nContext + old.nAdded > newLineCount) {
final String oldcnt = old.lineCount + ":" + newLineCount; //$NON-NLS-1$
final String newcnt = (nContext + old.nDeleted) + ":" //$NON-NLS-1$
+ (nContext + old.nAdded);
script.warn(buf, startOffset, MessageFormat.format(
JGitText.get().hunkHeaderDoesNotMatchBodyLineCountOf, oldcnt, newcnt));
}
return c;
}
void extractFileLines(OutputStream[] out) throws IOException {
final byte[] buf = file.buf;
int ptr = startOffset;
int eol = nextLF(buf, ptr);
if (endOffset <= eol)
return;
// Treat the hunk header as though it were from the ancestor,
// as it may have a function header appearing after it which
// was copied out of the ancestor file.
//
out[0].write(buf, ptr, eol - ptr);
SCAN: for (ptr = eol; ptr < endOffset; ptr = eol) {
eol = nextLF(buf, ptr);
switch (buf[ptr]) {
case ' ':
case '\n':
case '\\':
out[0].write(buf, ptr, eol - ptr);
out[1].write(buf, ptr, eol - ptr);
break;
case '-':
out[0].write(buf, ptr, eol - ptr);
break;
case '+':
out[1].write(buf, ptr, eol - ptr);
break;
default:
break SCAN;
}
}
}
void extractFileLines(final StringBuilder sb, final String[] text,
final int[] offsets) {
final byte[] buf = file.buf;
int ptr = startOffset;
int eol = nextLF(buf, ptr);
if (endOffset <= eol)
return;
copyLine(sb, text, offsets, 0);
SCAN: for (ptr = eol; ptr < endOffset; ptr = eol) {
eol = nextLF(buf, ptr);
switch (buf[ptr]) {
case ' ':
case '\n':
case '\\':
copyLine(sb, text, offsets, 0);
skipLine(text, offsets, 1);
break;
case '-':
copyLine(sb, text, offsets, 0);
break;
case '+':
copyLine(sb, text, offsets, 1);
break;
default:
break SCAN;
}
}
}
void copyLine(final StringBuilder sb, final String[] text,
final int[] offsets, final int fileIdx) {
final String s = text[fileIdx];
final int start = offsets[fileIdx];
int end = s.indexOf('\n', start);
if (end < 0)
end = s.length();
else
end++;
sb.append(s, start, end);
offsets[fileIdx] = end;
}
void skipLine(final String[] text, final int[] offsets,
final int fileIdx) {
final String s = text[fileIdx];
final int end = s.indexOf('\n', offsets[fileIdx]);
offsets[fileIdx] = end < 0 ? s.length() : end + 1;
}
/** {@inheritDoc} */
@SuppressWarnings("nls")
@Override
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("HunkHeader[");
buf.append(getOldImage().getStartLine());
buf.append(',');
buf.append(getOldImage().getLineCount());
buf.append("->");
buf.append(getNewStartLine()).append(',').append(getNewLineCount());
buf.append(']');
return buf.toString();
}
}
|