Add checkout reflog fzf

Signed-off-by: Aaron Hallaert <[email protected]>

Author: aaronhallaert

lua/advanced_git_search/actions.lua

@@ -58,4 +58,10 @@ M.open_in_browser = function(commit_hash)
     vim.api.nvim_command(":GBrowse " .. commit_hash)
 end
 
+---General action: Checkout commit
+---@param commit_hash string
+M.checkout_commit = function(commit_hash)
+    vim.api.nvim_command(":!git checkout " .. commit_hash)
+end
+
 return M

lua/advanced_git_search/commands/find.lua

@@ -12,6 +12,14 @@ M.git_branches = function()
     }
 end
 
+M.reflog = function()
+    return {
+        "git",
+        "reflog",
+        "--date=iso",
+    }
+end
+
 ---@param prompt string|nil
 ---@param author string|nil
 ---@param bufnr number|nil

lua/advanced_git_search/fzf/pickers/init.lua

@@ -161,6 +161,28 @@ M.changed_on_branch = function()
     )
 end
 
+M.checkout_reflog = function()
+    local opts = {
+        func_async_callback = false,
+        fn_transform = function(x)
+            return picker_utils.make_reflog_entry(x)
+        end,
+        actions = {
+            ["default"] = function(selected)
+                local selection = selected[1]
+                local commit = string.sub(selection, 1, 7)
+
+                require("advanced_git_search.actions").checkout_commit(commit)
+            end,
+        },
+    }
+
+    require("fzf-lua").fzf_exec(
+        table.concat(require("advanced_git_search.commands.find").reflog(), " "),
+        opts
+    )
+end
+
 --- Opens a selector for all advanced git search functions
 M.show_custom_functions = function()
     local keys = global_picker.keys("telescope")

lua/advanced_git_search/fzf/pickers/utils.lua

@@ -32,4 +32,33 @@ M.make_entry = function(entry)
         .. color.yellow(message)
 end
 
+M.make_reflog_entry = function(entry)
+    if entry == "" or entry == nil then
+        return
+    end
+
+    local cleaned = string.gsub(entry, "'", "")
+    local split = utils.split_string(cleaned, " ")
+    local hash = split[1]
+
+    local rest = split[2]
+    for i = 3, #split do
+        rest = rest .. " " .. split[i]
+    end
+
+    local split_on_double = utils.split_string(rest, ":")
+    local description = ""
+    for i = 4, #split_on_double do
+        description = description .. split_on_double[i]
+    end
+
+    local meta = ""
+    for i = 1, 3 do
+        meta = meta .. split_on_double[i]
+    end
+
+    -- NOTE: make sure the first value is the commit hash
+    return color.magenta(hash) .. " " .. meta .. "" .. color.yellow(description)
+end
+
 return M

lua/advanced_git_search/telescope/mappings/init.lua

@@ -102,7 +102,8 @@ local checkout = function(prompt_bufnr)
         splitted_reflog_entry[count] = i
         count = count + 1
     end
-    vim.api.nvim_command(":!git checkout " .. splitted_reflog_entry[1])
+
+    ags_actions.checkout_commit(splitted_reflog_entry[1])
 end
 
 --- Checkout the selected reflog entry with <CR>

lua/advanced_git_search/telescope/pickers/init.lua

@@ -155,7 +155,9 @@ M.checkout_reflog = function()
     pickers
         .new({
             results_title = "Git Reflog, <CR> to checkout",
-            finder = finders.new_oneshot_job({ "git", "reflog", "--date=iso" }),
+            finder = finders.new_oneshot_job(
+                require("advanced_git_search.commands.find").reflog()
+            ),
             sorter = sorters.get_fuzzy_file(),
             attach_mappings = function(_, map)
                 ags_mappings.checkout_reflog_entry(map)