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

Git: Limit blame range only for multiple lines selection

Browse Source 
Selecting a word should not result in a single line blame...

Change-Id: I03e8b75c519eb555b77985e7c68b3429bfff9446
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-17 14:30:23 +03:00
committed by Orgad Shaneh
parent 6a8d6296b1
commit 7a5b45bdc2
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/git/gitplugin.cpp
View File

@@ -679,17 +679,19 @@ void GitPlugin::blameFile()
int selectionEnd = cursor.selectionEnd();
cursor.setPosition(selectionStart);
const int startBlock = cursor.blockNumber();
firstLine = startBlock + 1;
if (auto widget = qobject_cast<VcsBaseEditorWidget *>(textEditor->widget())) {
const int previousFirstLine = widget->firstLineNumber();
if (previousFirstLine > 0)
firstLine = previousFirstLine;
}
argument += QString::number(firstLine) + ',';
cursor.setPosition(selectionEnd);
const int endBlock = cursor.blockNumber();
argument += QString::number(endBlock + firstLine - startBlock);
extraOptions << argument;
if (startBlock != endBlock) {
firstLine = startBlock + 1;
if (auto widget = qobject_cast<VcsBaseEditorWidget *>(textEditor->widget())) {
const int previousFirstLine = widget->firstLineNumber();
if (previousFirstLine > 0)
firstLine = previousFirstLine;
}
argument += QString::number(firstLine) + ',';
argument += QString::number(endBlock + firstLine - startBlock);
extraOptions << argument;
}
}
}
VcsBaseEditorWidget *editor = m_gitClient->annotate(