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

DiffEditor: Stage and unstage selected lines for Git

Browse Source 
Fixes: QTCREATORBUG-19071
Change-Id: I560ba208e68e477ea865e499847d819cfdfeb6f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Andre Hartmann
2017-11-29 21:36:30 +01:00
committed by Jarek Kobus
parent 2758682723
commit 1766832918
15 changed files with 422 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/diffeditor/diffeditorcontroller.cpp
View File

@@ -71,9 +71,10 @@ bool DiffEditorController::ignoreWhitespace() const
}
QString DiffEditorController::makePatch(int fileIndex, int chunkIndex,
const ChunkSelection &selection,
PatchOptions options) const
{
return m_document->makePatch(fileIndex, chunkIndex,
return m_document->makePatch(fileIndex, chunkIndex, selection,
options & Revert, options & AddPrefix);
}
@@ -143,9 +144,10 @@ void DiffEditorController::reloadFinished(bool success)
m_isReloading = false;
}
void DiffEditorController::requestChunkActions(QMenu *menu, int fileIndex, int chunkIndex)
void DiffEditorController::requestChunkActions(QMenu *menu, int fileIndex, int chunkIndex,
const ChunkSelection &selection)
{
emit chunkActionsRequested(menu, fileIndex, chunkIndex);
emit chunkActionsRequested(menu, fileIndex, chunkIndex, selection);
}
bool DiffEditorController::chunkExists(int fileIndex, int chunkIndex) const