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

Save / restore state in diff editor when reloading

Browse Source 
Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
jkobus
2014-07-11 12:55:31 +02:00
committed by Jarek Kobus
parent b97c9d731e
commit 87b5db5562
7 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.cpp
View File

@@ -211,6 +211,7 @@ void GitDiffHandler::postCollectShowDescription(const QString &id)
return;
}
m_controller->saveStateRequested();
m_controller->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(gitPath(),
m_workingDirectory,
@@ -286,6 +287,7 @@ void GitDiffHandler::postCollectTextualDiffOutput(const QString &gitCommand, con
return;
}
m_controller->saveStateRequested();
m_controller->clear(m_waitMessage);
VcsBase::Command *command = new VcsBase::Command(gitPath(),
m_workingDirectory,
@@ -313,6 +315,7 @@ void GitDiffHandler::slotTextualDiffOutputReceived(const QString &contents)
= DiffEditor::DiffUtils::readPatch(
contents, m_controller->isIgnoreWhitespace(), &ok);
m_controller->setDiffFiles(fileDataList, m_workingDirectory);
m_controller->restoreStateRequested();
deleteLater();
}