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

VCS: Discard commit if submit widget is disabled

Browse Source 
Change-Id: I8f11f56565f46919e93a30f754465de3bc44437e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-22 12:55:14 +03:00
committed by Orgad Shaneh
parent bbdd0655bc
commit a6d8bbbb14
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ GitSubmitEditor::GitSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *p
m_model(0),
m_commitEncoding(0),
m_commitType(SimpleCommit),
m_forceClose(false),
m_firstUpdate(true)
{
connect(this, SIGNAL(diffSelectedFiles(QList<int>)), this, SLOT(slotDiffSelected(QList<int>)));
@@ -186,14 +185,12 @@ void GitSubmitEditor::updateFileModel()
QString errorMessage, commitTemplate;
CommitData data(m_commitType);
if (client->getCommitData(m_workingDirectory, &commitTemplate, data, &errorMessage)) {
m_forceClose = false;
setCommitData(data);
submitEditorWidget()->refreshLog(m_workingDirectory);
widget()->setEnabled(true);
} else {
// Nothing to commit left!
VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
m_forceClose = true;
m_model->clear();
widget()->setEnabled(false);
}