Merge pull request #669 from macovsky/display-auto-merge

display auto-merge in pr view
pwntester · Nov 7, 2024 · 44060b7 · 44060b7
2 parents 650f33a + ab85598
commit 44060b7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/lua/octo/gh/graphql.lua b/lua/octo/gh/graphql.lua
@@ -1873,6 +1873,10 @@ query($endCursor: String) {
       }
       mergeStateStatus
       mergeable
+      autoMergeRequest {
+        enabledBy { login }
+        mergeMethod
+      }
     }
   }
 }

diff --git a/lua/octo/ui/writers.lua b/lua/octo/ui/writers.lua
@@ -491,6 +491,17 @@ function M.write_details(bufnr, issue, update)
       table.insert(details, merge_state_vt)
     end
 
+    if not issue.merged and issue.autoMergeRequest ~= vim.NIL then
+      local auto_merge_vt = {
+        { "Auto-merge: ", "OctoDetailsLabel" },
+        { "ENABLED", "OctoStateApproved" },
+        { " by " },
+        { issue.autoMergeRequest.enabledBy.login, "OctoUser" },
+        { " (" .. utils.auto_merge_method_map[issue.autoMergeRequest.mergeMethod] .. ")" },
+      }
+      table.insert(details, auto_merge_vt)
+    end
+
     -- changes
     local changes_vt = {
       { "Commits: ", "OctoDetailsLabel" },

diff --git a/lua/octo/utils.lua b/lua/octo/utils.lua
@@ -121,6 +121,12 @@ M.merge_state_message_map = {
   UNSTABLE = "! UNSTABLE",
 }
 
+M.auto_merge_method_map = {
+  MERGE = "commit",
+  REBASE = "rebase",
+  SQUASH = "squash",
+}
+
 function M.trim(str)
   if type(vim.fn.trim) == "function" then
     return vim.fn.trim(str)