diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2016-05-19 19:01:25 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-05-20 12:15:53 +0000 |
| commit | 3a78b610d76f315e5ac1a0c26844258b5c910a04 (patch) | |
| tree | da1f8f76e51593f639f2a4dc41d6b8183e42b638 /src/plugins/subversion | |
| parent | 67f9a26208df912425507a4d2c4733993e25b2d9 (diff) | |
VCS: Colorize unmerged files in submit editor
So far, conflicted files were displayed like added ones.
Now they are marked obvious, as they disable the commit button.
Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/subversionsubmiteditor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index 5388eb5672..568e9f5095 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -48,6 +48,8 @@ void SubversionSubmitEditor::setStatusList(const QList<StatusFilePair> &statusOu model->setFileStatusQualifier([](const QString &status, const QVariant &) -> VcsBase::SubmitFileModel::FileStatusHint { + if (status == QLatin1String("C")) + return VcsBase::SubmitFileModel::FileUnmerged; if (status == QLatin1String("A")) return VcsBase::SubmitFileModel::FileAdded; if (status == QLatin1String("M")) |