feat: Add confirm() function to handle commit selection and cursor fallback

Author: Salanoid

lua/gitlogdiff/actions.lua

@@ -5,7 +5,12 @@ local function diffview_open(args)
 end
 
 local function diffview_history(args)
-  vim.cmd("DiffviewFileHistory " .. table.concat(args, " "))
+  local root = vim.fs.root(0, ".git")
+  local cmd = "DiffviewFileHistory " .. table.concat(args, " ")
+  if root then
+    cmd = cmd .. " -- " .. vim.fn.fnameescape(root)
+  end
+  vim.cmd(cmd)
 end
 
 function M.show_selected(hashes, indices)

lua/gitlogdiff/ui.lua

@@ -89,6 +89,29 @@ function M.get_selected_hashes()
   return hashes
 end
 
+function M.confirm()
+  local hashes = M.get_selected_hashes()
+  local indices = M.get_selected_indices()
+
+  if #hashes == 0 then
+    local cursor_idx = M.state.cursor
+    local line = M.state.commits[cursor_idx]
+    if line then
+      local h = line:match("^(%w+)")
+      if h then
+        hashes = { h }
+        indices = { cursor_idx }
+      end
+    end
+  end
+
+  if M.state.win and api.nvim_win_is_valid(M.state.win) then
+    api.nvim_win_close(M.state.win, true)
+  end
+
+  require("gitlogdiff.actions").show_selected(hashes, indices)
+end
+
 function M.keymaps()
   local opts = { buffer = M.state.buf, silent = true }
 
@@ -100,10 +123,7 @@ function M.keymaps()
   end, opts)
   vim.keymap.set("n", "<space>", M.toggle, opts)
 
-  vim.keymap.set("n", "<CR>", function()
-    local ui = require("gitlogdiff.ui")
-    require("gitlogdiff.actions").show_selected(ui.get_selected_hashes(), ui.get_selected_indices())
-  end, opts)
+  vim.keymap.set("n", "<CR>", M.confirm, opts)
 
   vim.keymap.set("n", "q", function()
     if M.state.win and api.nvim_win_is_valid(M.state.win) then

tests/test_init.lua

@@ -40,13 +40,16 @@ end
 
 T["actions"]["show_selected() handles non-consecutive commits correctly"] = function()
   local actions = require("gitlogdiff.actions")
+  local root = vim.fs.root(0, ".git")
+  local expected_root = root and (" -- " .. vim.fn.fnameescape(root)) or ""
+
   local cmds = {}
   vim.cmd = function(cmd)
     table.insert(cmds, cmd)
   end
 
   actions.show_selected({ "newer123", "older789" }, { 1, 3 })
-  MiniTest.expect.equality(cmds[1], "DiffviewFileHistory --no-walk newer123 older789")
+  MiniTest.expect.equality(cmds[1], "DiffviewFileHistory --no-walk newer123 older789" .. expected_root)
 end
 
 T["log"] = MiniTest.new_set()

tests/test_ui.lua

@@ -56,4 +56,46 @@ T["get_selected_indices() works"] = function()
   MiniTest.expect.equality(indices, { 1, 3 })
 end
 
+T["confirm() works with selection"] = function()
+  local ui = require("gitlogdiff.ui")
+  local actions = require("gitlogdiff.actions")
+  local original_show = actions.show_selected
+  local captured_hashes, captured_indices
+
+  actions.show_selected = function(hashes, indices)
+    captured_hashes = hashes
+    captured_indices = indices
+  end
+
+  ui.open({ "abc1234 commit1", "def5678 commit2" })
+  ui.state.selected[1] = true
+  ui.confirm()
+
+  MiniTest.expect.equality(captured_hashes, { "abc1234" })
+  MiniTest.expect.equality(captured_indices, { 1 })
+
+  actions.show_selected = original_show
+end
+
+T["confirm() works with current line fallback"] = function()
+  local ui = require("gitlogdiff.ui")
+  local actions = require("gitlogdiff.actions")
+  local original_show = actions.show_selected
+  local captured_hashes, captured_indices
+
+  actions.show_selected = function(hashes, indices)
+    captured_hashes = hashes
+    captured_indices = indices
+  end
+
+  ui.open({ "abc1234 commit1", "def5678 commit2" })
+  ui.state.cursor = 2
+  ui.confirm()
+
+  MiniTest.expect.equality(captured_hashes, { "def5678" })
+  MiniTest.expect.equality(captured_indices, { 2 })
+
+  actions.show_selected = original_show
+end
+
 return T