More granular messaging and controls for merge state

Classes/Issues/Merge/IssueMergeModel.swift

@@ -12,13 +12,13 @@ import IGListKit
 final class IssueMergeModel: ListDiffable {
 
     let id: String
-    let state: MergeableState
+    let state: MergeStateStatus
     let contexts: [IssueMergeContextModel]
     let availableTypes: [IssueMergeType]
 
     init(
         id: String,
-        state: MergeableState,
+        state: MergeStateStatus,
         contexts: [IssueMergeContextModel],
         availableTypes: [IssueMergeType]
         ) {

Classes/Issues/Merge/IssueMergeSectionController.swift

@@ -92,16 +92,38 @@ ListBindingSectionControllerSelectionDelegate {
 
         viewModels += object.contexts as [ListDiffable]
 
-        let mergeable = object.state == .mergeable
+        let title: String
+        let state: IssueMergeSummaryModel.State
+        let buttonEnabled: Bool
+        switch object.state {
+        case .clean, .hasHooks, .unstable:
+            title = NSLocalizedString("No conflicts with base branch", comment: "")
+            state = .success
+            buttonEnabled = true
+        case .behind:
+            title = NSLocalizedString("Head ref is out of date", comment: "")
+            state = .warning
+            buttonEnabled = false
+        case .blocked:
+            title = NSLocalizedString("Not authorized to merge", comment: "")
+            state = .failure
+            buttonEnabled = false
+        case .unknown, .__unknown(_):
+            title = NSLocalizedString("Merge status unknown", comment: "")
+            state = .pending
+            buttonEnabled = false
+        case .dirty:
+            title = NSLocalizedString("Merge conflicts found", comment: "")
+            state = .warning
+            buttonEnabled = false
+        }
         viewModels.append(IssueMergeSummaryModel(
-            title: mergeable ?
-                NSLocalizedString("No conflicts with base branch", comment: "")
-                : NSLocalizedString("Merge conflicts found", comment: ""),
-            state: mergeable ? .success : .warning
+            title: title,
+            state: state
         ))
 
         viewModels.append(IssueMergeButtonModel(
-            enabled: mergeable,
+            enabled: buttonEnabled,
             type: preferredMergeType,
             loading: loading
         ))

Classes/Issues/Merge/IssueMergeSummaryCell.swift

@@ -62,7 +62,10 @@ final class IssueMergeSummaryCell: CardCollectionViewCell, ListBindable {
         case .failure:
             imageViewBackground = Styles.Colors.Red.medium.color
             iconName = "merge-x"
-        case .warning, .pending:
+        case .pending:
+            imageViewBackground = Styles.Colors.Yellow.medium.color
+            iconName = "primitive-dot"
+        case .warning:
             imageViewBackground = Styles.Colors.Gray.medium.color
             iconName = "merge-alert"
         }

Classes/Issues/PullRequest+IssueType.swift

@@ -76,7 +76,7 @@ extension IssueOrPullRequestQuery.Data.Repository.IssueOrPullRequest.AsPullReque
 
         return IssueMergeModel(
             id: commit.id,
-            state: mergeable,
+            state: mergeStateStatus,
             contexts: contexts,
             availableTypes: availableTypes
         )

Local Pods/GitHubAPI/GitHubAPI/ConfiguredNetworkers.swift

@@ -22,6 +22,9 @@ public func ConfiguredNetworkers(
         additionalHeaders["Authorization"] = header
     }
 
+    // https://developer.github.com/v4/previews/#mergeinfopreview---more-detailed-information-about-a-pull-requests-merge-state
+    additionalHeaders["Accept"] = "application/vnd.github.merge-info-preview+json"
+
     let config = URLSessionConfiguration.default
     config.httpAdditionalHeaders = additionalHeaders
     config.timeoutIntervalForRequest = 15

Resources/Assets.xcassets/splash_branches.imageset/Contents.json

@@ -1,5 +1,9 @@
 {
   "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
     {
       "idiom" : "universal",
       "filename" : "splash_branches@2x.png",

gql/IssueOrPullRequest.graphql

@@ -412,6 +412,7 @@ query IssueOrPullRequest($owner: String!, $repo: String!, $number: Int!, $page_s
         additions
         deletions
         mergeable
+        mergeStateStatus
       }
     }
   }