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

Git: Show deleted files in diff file combobox

Browse Source 
Task-number: QTCREATORBUG-6886

Change-Id: I99e076d9881bead58cbcb9c66f3e5ab1d1187b6f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-02-03 15:22:43 +01:00
parent ca4efa4a34
commit d955d873b4
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/git/giteditor.cpp
View File

@@ -112,7 +112,7 @@ QString GitEditor::changeUnderCursor(const QTextCursor &c) const
VcsBase::DiffHighlighter *GitEditor::createDiffHighlighter() const
{
const QRegExp filePattern(QLatin1String("^(diff --git a/|index |[+-][+-][+-] [ab]).*$"));
const QRegExp filePattern(QLatin1String("^(diff --git a/|index |[+-][+-][+-] [ab/]).*$"));
return new VcsBase::DiffHighlighter(filePattern);
}
@@ -123,15 +123,29 @@ VcsBase::BaseAnnotationHighlighter *GitEditor::createAnnotationHighlighter(const
QString GitEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const
{
// Check for "+++ b/src/plugins/git/giteditor.cpp" (blame and diff)
// Check for "+++ b/src/plugins/git/giteditor.cpp" (blame and diff)
// as well as "--- a/src/plugins/git/giteditor.cpp".
// Go back chunks.
const QString newFileIndicator = QLatin1String("+++ b/");
for (QTextBlock block = inBlock; block.isValid(); block = block.previous()) {
bool checkForOld = false;
const QString oldFileIndicator = QLatin1String("--- a/");
const QString newFileIndicator = QLatin1String("+++ ");
for (QTextBlock block = inBlock; block.isValid(); block = block.previous()) {
QString diffFileName = block.text();
if (diffFileName.startsWith(newFileIndicator)) {
if (diffFileName.startsWith(oldFileIndicator) && checkForOld) {
diffFileName.remove(0, oldFileIndicator.size());
checkForOld = false;
return diffFileName;
} else if (diffFileName.startsWith(newFileIndicator)) {
diffFileName.remove(0, newFileIndicator.size());
if (diffFileName == QLatin1String("/dev/null")) {
checkForOld = true;
continue;
}
diffFileName.remove(0, 2); // remove "b/"
return findDiffFile(diffFileName);
}
checkForOld = false;
}
return QString();
}

4
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -1094,7 +1094,7 @@ void VcsBaseEditorWidget::jumpToChangeFromDiff(QTextCursor cursor)
block = block.previous();
if (!block.isValid())
return;
const QString fileName = fileNameFromDiffSpecification(block);
const QString fileName = findDiffFile(fileNameFromDiffSpecification(block));
const bool exists = fileName.isEmpty() ? false : QFile::exists(fileName);
@@ -1126,7 +1126,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const
}
if (!chunkStart || !block.isValid())
return rc;
rc.fileName = fileNameFromDiffSpecification(block);
rc.fileName = findDiffFile(fileNameFromDiffSpecification(block));
if (rc.fileName.isEmpty())
return rc;
// Concatenate chunk and convert