Standardize revert popup API to be the same as cherry pick popup. Also

add revert to commit view
CKolkey · Jul 13, 2023 · 86400f6 · 86400f6
1 parent b38e7eb
commit 86400f6
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/lua/neogit/buffers/commit_view/init.lua b/lua/neogit/buffers/commit_view/init.lua
@@ -129,6 +129,9 @@ function M:open()
         ["A"] = function()
           CherryPickPopup.create { commits = { self.commit_info.oid } }
         end,
+        ["_"] = function()
+          RevertPopup.create{ commits = { self.commit_info.oid } }
+        end,
         ["q"] = function()
           self:close()
         end,

diff --git a/lua/neogit/buffers/log_view/init.lua b/lua/neogit/buffers/log_view/init.lua
@@ -81,7 +81,7 @@ function M:open()
         end,
         ["_"] = function()
           local stack = self.buffer.ui:get_component_stack_under_cursor()
-          RevertPopup.create(stack[#stack].options.oid)
+          RevertPopup.create { commits = { stack[#stack].options.oid } }
         end,
         ["<enter>"] = function()
           local stack = self.buffer.ui:get_component_stack_under_cursor()

diff --git a/lua/neogit/buffers/reflog_view/init.lua b/lua/neogit/buffers/reflog_view/init.lua
@@ -77,7 +77,7 @@ function M:open()
         end,
         ["_"] = function()
           local stack = self.buffer.ui:get_component_stack_under_cursor()
-          RevertPopup.create(stack[#stack].options.oid)
+          RevertPopup.create { commits = { stack[#stack].options.oid } }
         end,
         ["<enter>"] = function()
           local stack = self.buffer.ui:get_component_stack_under_cursor()

diff --git a/lua/neogit/popups/revert/actions.lua b/lua/neogit/popups/revert/actions.lua
@@ -8,7 +8,7 @@ local M = {}
 ---@return table
 local function get_commits(popup)
   local commits
-  if popup.state.env.commits[1] then
+  if popup.state.env.commits and popup.state.env.commits[1] then
     commits = popup.state.env.commits
   else
     commits = { CommitSelectViewBuffer.new(git.log.list { "--max-count=256" }):open_async() }

diff --git a/lua/neogit/popups/revert/init.lua b/lua/neogit/popups/revert/init.lua
@@ -3,7 +3,7 @@ local popup = require("neogit.lib.popup")
 
 local M = {}
 
-function M.create(commits)
+function M.create(env)
   -- TODO: enabled = true needs to check if incompatible switch is toggled in internal state, and not apply.
   --       if you enable 'no edit', and revert, next time you load the popup both will be enabled
   --
@@ -19,7 +19,7 @@ function M.create(commits)
     :switch("E", "no-edit", "Don't edit commit messages", { incompatible = { "edit" } })
     :action("_", "Revert commit", actions.commits) -- TODO: Support multiple commits
     :action("v", "Revert changes")
-    :env({ commits = commits or {} })
+    :env({ commits = env.commits })
     :build()
 
   p:show()

diff --git a/lua/neogit/status.lua b/lua/neogit/status.lua
@@ -1044,7 +1044,9 @@ local cmd_func_map = function()
     end,
     ["RevertPopup"] = function()
       local line = M.status_buffer:get_current_line()
-      require("neogit.popups.revert").create { line[1]:match("^(%x%x%x%x%x%x%x+)") }
+      require("neogit.popups.revert").create {
+        commits = { line[1]:match("^(%x%x%x%x%x%x%x+)") },
+      }
     end,
     ["BranchPopup"] = require("neogit.popups.branch").create,
     ["FetchPopup"] = require("neogit.popups.fetch").create,