MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] simplify lines processing

Browse Source 
(cherry picked from commit 0426492)
This commit is contained in:
Julia Beliaeva
2016-12-18 18:38:16 +03:00
committed by Julia Beliaeva
parent 3ae85b7253
commit c468cd513b
1 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+40 -44
View File
@@ -1014,7 +1014,7 @@ public class GitHistoryUtils {
@Nullable private VcsException myException = null;
private int myRecords = 0;
private boolean myFoundRecordEnd = false;
private boolean myIsInsideBody = true;
public MyGitLineHandlerListener(@NotNull GitLineHandler handler,
@NotNull Consumer<StringBuilder> recordConsumer,
@@ -1033,49 +1033,7 @@ public class GitHistoryUtils {
}
else if (outputType == ProcessOutputTypes.STDOUT) {
try {
// format of the record is <RECORD_START>.*<RECORD_END>.*
// then next record goes
// (rather inconveniently, after RECORD_END there is a list of modified files)
// so here I'm trying to find text between two RECORD_START symbols
// that simultaneously contains a RECORD_END
// this helps to deal with commits like a929478f6720ac15d949117188cd6798b4a9c286 in linux repo that have RECORD_START symbols in the message
// wont help with RECORD_END symbols in the message however (have not seen those yet)
String tail = null;
if (!myFoundRecordEnd) {
int recordEnd = line.indexOf(GitLogParser.RECORD_END);
if (recordEnd != -1) {
myFoundRecordEnd = true;
myOutput.append(line.substring(0, recordEnd + 1));
line = line.substring(recordEnd + 1);
}
else {
myOutput.append(line).append("\n");
}
}
if (myFoundRecordEnd) {
int nextRecordStart = line.indexOf(GitLogParser.RECORD_START);
if (nextRecordStart == -1) {
myOutput.append(line).append("\n");
}
else if (nextRecordStart == 0) {
tail = line + "\n";
}
else {
myOutput.append(line.substring(0, nextRecordStart));
tail = line.substring(nextRecordStart) + "\n";
}
}
if (tail != null) {
if (++myRecords > myBufferSize) {
myRecordConsumer.consume(myOutput);
myOutput.setLength(0);
}
myOutput.append(tail);
myFoundRecordEnd = tail.contains(GitLogParser.RECORD_END);
}
processOutputLine(line);
}
catch (Exception e) {
myException = new VcsException(e);
@@ -1083,6 +1041,44 @@ public class GitHistoryUtils {
}
}
private void processOutputLine(@NotNull String line) {
// format of the record is <RECORD_START><BODY><RECORD_END><CHANGES>
// then next record goes
// (rather inconveniently, after RECORD_END there is a list of modified files)
// so here I'm trying to find text between two RECORD_START symbols
// that simultaneously contains a RECORD_END
// this helps to deal with commits like a929478f6720ac15d949117188cd6798b4a9c286 in linux repo that have RECORD_START symbols in the message
// wont help with RECORD_END symbols in the message however (have not seen those yet)
if (myIsInsideBody) {
// find body
int bodyEnd = line.indexOf(GitLogParser.RECORD_END);
if (bodyEnd >= 0) {
myIsInsideBody = false;
myOutput.append(line.substring(0, bodyEnd + 1));
processOutputLine(line.substring(bodyEnd + 1));
}
else {
myOutput.append(line).append("\n");
}
}
else {
int nextRecordStart = line.indexOf(GitLogParser.RECORD_START);
if (nextRecordStart >= 0) {
myOutput.append(line.substring(0, nextRecordStart));
if (++myRecords > myBufferSize) {
myRecordConsumer.consume(myOutput);
myOutput.setLength(0);
}
myIsInsideBody = true;
processOutputLine(line.substring(nextRecordStart));
}
else {
myOutput.append(line).append("\n");
}
}
}
@Override
public void processTerminated(int exitCode) {
if (exitCode != 0) {