feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Fix detection of subsequent renames

Browse Source 
Change-Id: Ie47c5a7ca91752b0da40b46f780ee5e0b3b6ce29
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
Orgad Shaneh
2014-09-29 12:14:15 +03:00
committed by Orgad Shaneh
parent c3c19aaab6
commit 0b1b080cb3
2 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/diffeditor/diffutils.cpp
View File

@@ -741,7 +741,7 @@ static QList<ChunkData> readChunks(const QString &patch,
chunkData.rightStartingLineNumber = rightStartingPos - 1;
chunkData.contextInfo = contextInfo;
chunkDataList.append(chunkData);
} while ((pos = chunkRegExp.indexIn(patch, pos)) != -1);
} while ((pos = chunkRegExp.indexIn(patch, pos, QRegExp::CaretAtOffset)) != -1);
if (endOfLastChunk > 0) {
const QString lines = patch.mid(endOfLastChunk);
@@ -1037,8 +1037,8 @@ static QList<FileData> readGitPatch(const QString &patch, bool ignoreWhitespace,
QList<FileData> fileDataList;
const int simpleGitPos = simpleGitRegExp.indexIn(patch, 0);
const int similarityPos = similarityRegExp.indexIn(patch, 0);
int simpleGitPos = simpleGitRegExp.indexIn(patch);
int similarityPos = similarityRegExp.indexIn(patch);
bool simpleGitMatched = false;
int pos = -1;
@@ -1104,8 +1104,8 @@ static QList<FileData> readGitPatch(const QString &patch, bool ignoreWhitespace,
break; // either copy or rename, otherwise broken
}
const int simpleGitPos = simpleGitRegExp.indexIn(patch, pos);
const int similarityPos = similarityRegExp.indexIn(patch, pos);
simpleGitPos = simpleGitRegExp.indexIn(patch, pos, QRegExp::CaretAtOffset);
similarityPos = similarityRegExp.indexIn(patch, pos, QRegExp::CaretAtOffset);
simpleGitMatched = false;
pos = -1;