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

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