Merge pull request #666 from macovsky/display-merge-state

display merge state in PR

lua/octo/gh/graphql.lua

@@ -1871,6 +1871,8 @@ query($endCursor: String) {
       statusCheckRollup {
         state
       }
+      mergeStateStatus
+      mergeable
     }
   }
 }

lua/octo/ui/writers.lua

@@ -460,6 +460,7 @@ function M.write_details(bufnr, issue, update)
       table.insert(details, decision_vt)
     end
 
+    -- checks
     if issue.statusCheckRollup and issue.statusCheckRollup ~= vim.NIL then
       local state = issue.statusCheckRollup.state
       local checks_vt = {
@@ -469,6 +470,27 @@ function M.write_details(bufnr, issue, update)
       table.insert(details, checks_vt)
     end
 
+    -- merge state
+    if not issue.merged and issue.mergeable then
+      local merge_state_vt = {
+        { "Merge: ", "OctoDetailsLabel" },
+      }
+
+      if issue.mergeable == "MERGEABLE" then
+        table.insert(
+          merge_state_vt,
+          { utils.merge_state_message_map[issue.mergeStateStatus], utils.merge_state_hl_map[issue.mergeStateStatus] }
+        )
+      else
+        table.insert(
+          merge_state_vt,
+          { utils.mergeable_message_map[issue.mergeable], utils.mergeable_hl_map[issue.mergeable] }
+        )
+      end
+
+      table.insert(details, merge_state_vt)
+    end
+
     -- changes
     local changes_vt = {
       { "Commits: ", "OctoDetailsLabel" },

lua/octo/utils.lua

@@ -80,11 +80,45 @@ M.checks_hl_map = {
 }
 
 M.checks_message_map = {
-  ERROR = "× errored",
-  EXPECTED = " expected",
-  FAILURE = "× failed",
-  PENDING = " pending",
-  SUCCESS = "✓ passed",
+  ERROR = "× ERRORED",
+  EXPECTED = " EXPECTED",
+  FAILURE = "× FAILED",
+  PENDING = " PENDING",
+  SUCCESS = "✓ PASSED",
+}
+
+M.mergeable_hl_map = {
+  CONFLICTING = "OctoStateDismissed",
+  MERGEABLE = "OctoStateApproved",
+  UNKNOWN = "OctoStatePending",
+}
+
+M.mergeable_message_map = {
+  CONFLICTING = "× CONFLICTING",
+  MERGEABLE = "✓ MERGEABLE",
+  UNKNOWN = " PENDING",
+}
+
+M.merge_state_hl_map = {
+  BEHIND = "OctoNormal",
+  BLOCKED = "OctoStateDismissed",
+  CLEAN = "OctoStateApproved",
+  DIRTY = "OctoStateDismissed",
+  DRAFT = "OctoStateDraftFloat",
+  HAS_HOOKS = "OctoStateApproved",
+  UNKNOWN = "OctoStatePending",
+  UNSTABLE = "OctoStateDismissed",
+}
+
+M.merge_state_message_map = {
+  BEHIND = "- OUT-OF-DATE",
+  BLOCKED = "× BLOCKED",
+  CLEAN = "✓ CLEAN",
+  DIRTY = "× DIRTY",
+  DRAFT = "= DRAFT",
+  HAS_HOOKS = "✓ HAS-HOOKS",
+  UNKNOWN = " PENDING",
+  UNSTABLE = "! UNSTABLE",
 }
 
 function M.trim(str)