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>

share/qtcreator/themes/dark.creatortheme

@@ -164,6 +164,7 @@ VcsBase_FileAdded_TextColor=ff00ff00
 VcsBase_FileModified_TextColor=ff8ee0ff
 VcsBase_FileDeleted_TextColor=fffff6c6c
 VcsBase_FileRenamed_TextColor=ffffa500
+VcsBase_FileUnmerged_TextColor=ffff4040
 
 Bookmarks_TextMarkColor=ff8080ff
 

share/qtcreator/themes/default.creatortheme

@@ -156,8 +156,9 @@ Welcome_LinkColor=ff5caa15
 VcsBase_FileStatusUnknown_TextColor=ff000000
 VcsBase_FileAdded_TextColor=ff00aa00
 VcsBase_FileModified_TextColor=ff0000ee
-VcsBase_FileDeleted_TextColor=ffee0000
+VcsBase_FileDeleted_TextColor=ff800000
 VcsBase_FileRenamed_TextColor=ffd77d00
+VcsBase_FileUnmerged_TextColor=ffee0000
 
 Bookmarks_TextMarkColor=ffa0a0ff
 

share/qtcreator/themes/flat.creatortheme

@@ -166,8 +166,9 @@ Welcome_LinkColor=ff5caa15
 VcsBase_FileStatusUnknown_TextColor=ff000000
 VcsBase_FileAdded_TextColor=ff00aa00
 VcsBase_FileModified_TextColor=ff0000ee
-VcsBase_FileDeleted_TextColor=ffee0000
+VcsBase_FileDeleted_TextColor=ff800000
 VcsBase_FileRenamed_TextColor=ffd77d00
+VcsBase_FileUnmerged_TextColor=ffee0000
 
 Bookmarks_TextMarkColor=ffa0a0ff
 

src/libs/utils/theme/theme.h

@@ -215,6 +215,7 @@ public:
         VcsBase_FileModified_TextColor,
         VcsBase_FileDeleted_TextColor,
         VcsBase_FileRenamed_TextColor,
+        VcsBase_FileUnmerged_TextColor,
 
         /* Bookmarks Plugin */
         Bookmarks_TextMarkColor,

src/plugins/git/gitsubmiteditor.cpp

@@ -142,6 +142,8 @@ void GitSubmitEditor::setCommitData(const CommitData &d)
                                     -> SubmitFileModel::FileStatusHint
     {
         const FileStates state = static_cast<FileStates>(extraData.toInt());
+        if (state & (UnmergedFile | UnmergedThem | UnmergedUs))
+            return SubmitFileModel::FileUnmerged;
         if (state.testFlag(AddedFile) || state.testFlag(UntrackedFile))
             return SubmitFileModel::FileAdded;
         if (state.testFlag(ModifiedFile))

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"))

src/plugins/vcsbase/submitfilemodel.cpp

@@ -61,6 +61,9 @@ static QBrush fileStatusTextForeground(SubmitFileModel::FileStatusHint statusHin
     case SubmitFileModel::FileRenamed:
         statusTextColor = Theme::VcsBase_FileRenamed_TextColor;
         break;
+    case VcsBase::SubmitFileModel::FileUnmerged:
+        statusTextColor = Theme::VcsBase_FileUnmerged_TextColor;
+        break;
     }
     return QBrush(Utils::creatorTheme()->color(statusTextColor));
 }

src/plugins/vcsbase/submitfilemodel.h

@@ -75,7 +75,8 @@ public:
         FileAdded,
         FileModified,
         FileDeleted,
-        FileRenamed
+        FileRenamed,
+        FileUnmerged
     };
 
     // Function that converts(qualifies) a QString/QVariant pair to FileStatusHint