feature: Add support for handling non-consecutive commit selections

Author: Salanoid

lua/gitlogdiff/actions.lua

@@ -2,26 +2,41 @@ local M = {}
 
 local function diffview_open(args)
   vim.cmd("DiffviewOpen " .. table.concat(args, " "))
-  -- vim.cmd("CodeDiff " .. table.concat(args, " "))
 end
 
-function M.show_selected(hashes)
+local function diffview_history(args)
+  vim.cmd("DiffviewFileHistory " .. table.concat(args, " "))
+end
+
+function M.show_selected(hashes, indices)
   if #hashes == 0 then
     vim.notify("No commits selected", vim.log.levels.INFO)
     return
   end
 
-  local ordered = {}
-  for i = #hashes, 1, -1 do
-    table.insert(ordered, hashes[i])
+  local is_consecutive = true
+  if #indices > 1 then
+    for i = 2, #indices do
+      if indices[i] ~= indices[i - 1] + 1 then
+        is_consecutive = false
+        break
+      end
+    end
   end
 
-  if #ordered == 1 then
-    diffview_open({ ordered[1] .. "^.." .. ordered[1] })
-    return
+  if is_consecutive then
+    if #hashes == 1 then
+      diffview_open({ hashes[1] .. "^.." .. hashes[1] })
+    else
+      diffview_open({ hashes[#hashes] .. "^.." .. hashes[1] })
+    end
+  else
+    local args = { "--no-walk" }
+    for _, h in ipairs(hashes) do
+      table.insert(args, h)
+    end
+    diffview_history(args)
   end
-
-  diffview_open({ ordered[1] .. ".." .. ordered[#ordered] })
 end
 
 return M

lua/gitlogdiff/ui.lua

@@ -67,14 +67,23 @@ function M.toggle()
   M.render()
 end
 
-function M.get_selected_hashes()
-  local hashes = {}
+function M.get_selected_indices()
+  local indices = {}
   for i = 1, #M.state.commits do
     if M.state.selected[i] then
-      local h = M.state.commits[i]:match("^(%w+)")
-      if h then
-        table.insert(hashes, h)
-      end
+      table.insert(indices, i)
+    end
+  end
+  return indices
+end
+
+function M.get_selected_hashes()
+  local hashes = {}
+  local indices = M.get_selected_indices()
+  for _, i in ipairs(indices) do
+    local h = M.state.commits[i]:match("^(%w+)")
+    if h then
+      table.insert(hashes, h)
     end
   end
   return hashes
@@ -92,7 +101,8 @@ function M.keymaps()
   vim.keymap.set("n", "<space>", M.toggle, opts)
 
   vim.keymap.set("n", "<CR>", function()
-    require("gitlogdiff.actions").show_selected(M.get_selected_hashes())
+    local ui = require("gitlogdiff.ui")
+    require("gitlogdiff.actions").show_selected(ui.get_selected_hashes(), ui.get_selected_indices())
   end, opts)
 
   vim.keymap.set("n", "q", function()

tests/test_init.lua

@@ -23,7 +23,7 @@ T["actions"]["show_selected() diffs single commit correctly"] = function()
     table.insert(cmds, cmd)
   end
 
-  actions.show_selected({ "abc1234" })
+  actions.show_selected({ "abc1234" }, { 1 })
   MiniTest.expect.equality(cmds[1], "DiffviewOpen abc1234^..abc1234")
 end
 
@@ -34,8 +34,19 @@ T["actions"]["show_selected() diffs two commits correctly"] = function()
     table.insert(cmds, cmd)
   end
 
-  actions.show_selected({ "newer123", "older456" })
-  MiniTest.expect.equality(cmds[1], "DiffviewOpen older456..newer123")
+  actions.show_selected({ "newer123", "older456" }, { 1, 2 })
+  MiniTest.expect.equality(cmds[1], "DiffviewOpen older456^..newer123")
+end
+
+T["actions"]["show_selected() handles non-consecutive commits correctly"] = function()
+  local actions = require("gitlogdiff.actions")
+  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")
 end
 
 T["log"] = MiniTest.new_set()

tests/test_ui.lua

@@ -46,4 +46,14 @@ T["get_selected_hashes() works"] = function()
   MiniTest.expect.equality(hashes, { "abc1234", "ghi9012" })
 end
 
+T["get_selected_indices() works"] = function()
+  local ui = require("gitlogdiff.ui")
+  ui.open({ "abc1234 commit1", "def5678 commit2", "ghi9012 commit3" })
+  ui.state.selected[1] = true
+  ui.state.selected[3] = true
+
+  local indices = ui.get_selected_indices()
+  MiniTest.expect.equality(indices, { 1, 3 })
+end
+
 return T