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
|
/*
* 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 java.nio.charset.StandardCharsets.ISO_8859_1;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.HashSet;
import org.eclipse.jgit.util.MutableInteger;
import org.eclipse.jgit.util.RawParseUtils;
import org.eclipse.jgit.util.TemporaryBuffer;
import org.junit.Test;
public class EGitPatchHistoryTest {
@Test
public void testParseHistory() throws Exception {
final NumStatReader numstat = new NumStatReader();
numstat.read();
final HashMap<String, HashMap<String, StatInfo>> stats = numstat.stats;
assertEquals(1211, stats.size());
new PatchReader(stats).read();
}
static class StatInfo {
int added, deleted;
}
static class PatchReader extends CommitReader {
final HashSet<String> offBy1;
final HashMap<String, HashMap<String, StatInfo>> stats;
int errors;
PatchReader(HashMap<String, HashMap<String, StatInfo>> s)
throws IOException {
super(new String[] { "-p" });
stats = s;
offBy1 = new HashSet<>();
offBy1.add("9bda5ece6806cd797416eaa47c7b927cc6e9c3b2");
}
@Override
void onCommit(String cid, byte[] buf) {
final HashMap<String, StatInfo> files = stats.remove(cid);
assertNotNull("No files for " + cid, files);
final Patch p = new Patch();
p.parse(buf, 0, buf.length - 1);
assertEquals("File count " + cid, files.size(), p.getFiles().size());
if (!p.getErrors().isEmpty()) {
for (FormatError e : p.getErrors()) {
System.out.println("error " + e.getMessage());
System.out.println(" at " + e.getLineText());
}
dump(buf);
fail("Unexpected error in " + cid);
}
for (FileHeader fh : p.getFiles()) {
final String fileName;
if (fh.getChangeType() != FileHeader.ChangeType.DELETE)
fileName = fh.getNewPath();
else
fileName = fh.getOldPath();
final StatInfo s = files.remove(fileName);
final String nid = fileName + " in " + cid;
assertNotNull("No " + nid, s);
int added = 0, deleted = 0;
for (HunkHeader h : fh.getHunks()) {
added += h.getOldImage().getLinesAdded();
deleted += h.getOldImage().getLinesDeleted();
}
if (s.added == added) {
//
} else if (s.added == added + 1 && offBy1.contains(cid)) {
//
} else {
dump(buf);
assertEquals("Added diff in " + nid, s.added, added);
}
if (s.deleted == deleted) {
//
} else if (s.deleted == deleted + 1 && offBy1.contains(cid)) {
//
} else {
dump(buf);
assertEquals("Deleted diff in " + nid, s.deleted, deleted);
}
}
assertTrue("Missed files in " + cid, files.isEmpty());
}
private static void dump(byte[] buf) {
String str;
try {
str = new String(buf, 0, buf.length - 1, "ISO-8859-1");
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
System.out.println("<<" + str + ">>");
}
}
static class NumStatReader extends CommitReader {
final HashMap<String, HashMap<String, StatInfo>> stats = new HashMap<>();
NumStatReader() throws IOException {
super(new String[] { "--numstat" });
}
@Override
void onCommit(String commitId, byte[] buf) {
final HashMap<String, StatInfo> files = new HashMap<>();
final MutableInteger ptr = new MutableInteger();
while (ptr.value < buf.length) {
if (buf[ptr.value] == '\n')
break;
final StatInfo i = new StatInfo();
i.added = RawParseUtils.parseBase10(buf, ptr.value, ptr);
i.deleted = RawParseUtils.parseBase10(buf, ptr.value + 1, ptr);
final int eol = RawParseUtils.nextLF(buf, ptr.value);
final String name = RawParseUtils.decode(UTF_8,
buf, ptr.value + 1, eol - 1);
files.put(name, i);
ptr.value = eol;
}
stats.put(commitId, files);
}
}
abstract static class CommitReader {
private Process proc;
CommitReader(String[] args) throws IOException {
final String[] realArgs = new String[3 + args.length + 1];
realArgs[0] = "git";
realArgs[1] = "log";
realArgs[2] = "--pretty=format:commit %H";
System.arraycopy(args, 0, realArgs, 3, args.length);
realArgs[3 + args.length] = "a4b98ed15ea5f165a7aa0f2fd2ea6fcce6710925";
proc = Runtime.getRuntime().exec(realArgs);
proc.getOutputStream().close();
proc.getErrorStream().close();
}
void read() throws IOException, InterruptedException {
try (BufferedReader in = new BufferedReader(
new InputStreamReader(proc.getInputStream(), ISO_8859_1))) {
String commitId = null;
TemporaryBuffer buf = null;
for (;;) {
String line = in.readLine();
if (line == null)
break;
if (line.startsWith("commit ")) {
if (buf != null) {
buf.close();
onCommit(commitId, buf.toByteArray());
buf.destroy();
}
commitId = line.substring("commit ".length());
buf = new TemporaryBuffer.LocalFile(null);
} else if (buf != null) {
buf.write(line.getBytes(ISO_8859_1));
buf.write('\n');
}
}
}
assertEquals(0, proc.waitFor());
proc = null;
}
abstract void onCommit(String commitId, byte[] buf);
}
}
|
