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

Git: Disable Commit button when unmerged files exist

Browse Source 
Change-Id: Icea74641516292b130784d2d7d48bd05254480df
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 19:46:45 +02:00
parent cbf75f676a
commit 4c9f7dac4a
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,8 +61,10 @@ GitSubmitEditorWidget *GitSubmitEditor::submitEditorWidget()
void GitSubmitEditor::setCommitData(const CommitData &d)
{
submitEditorWidget()->setPanelData(d.panelData);
submitEditorWidget()->setPanelInfo(d.panelInfo);
GitSubmitEditorWidget *w = submitEditorWidget();
w->setPanelData(d.panelData);
w->setPanelInfo(d.panelInfo);
w->setHasUnmerged(false);
m_commitEncoding = d.commitEncoding;
@@ -73,12 +75,14 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
const FileStates state = it->first;
const QString file = it->second;
VcsBase::CheckMode checkMode;
if (state & UnmergedFile)
if (state & UnmergedFile) {
checkMode = VcsBase::Uncheckable;
else if (state & StagedFile)
w->setHasUnmerged(true);
} else if (state & StagedFile) {
checkMode = VcsBase::Checked;
else
} else {
checkMode = VcsBase::Unchecked;
}
m_model->addFile(file, CommitData::stateDisplayName(state), checkMode,
QVariant(static_cast<int>(state)));
}