Implement a toggle to show author or date of commit

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

Author: aaronhallaert

README.md

@@ -35,6 +35,7 @@ _Grep behaviour_: filter on added, updated or removed code (log content: `-G` op
 - `<C-e>` show the entire commit for all files in neovim with diff plugin
 - `<C-o>` Open the selected commit in the browser
 - `<C-y>` copy the commit hash to clipboard
+- `<C-w>` toggle date and author in entry
 
 ### 2. search_log_content_file -- Search in file log content
 
@@ -49,6 +50,7 @@ _Grep behaviour_: filter on added, updated or removed code (log content: `-G` op
 - `<C-e>` show the entire commit for all files in neovim with diff plugin
 - `<C-o>` Open the selected commit in the browser
 - `<C-y>` copy the commit hash to clipboard
+- `<C-w>` toggle date and author in entry
 
 ### 3. diff_commit_file -- Diff current file with commit
 
@@ -63,6 +65,7 @@ _Grep behaviour_: filter on commit message.
 - `<C-e>` show the entire commit for all files in neovim with diff plugin
 - `<C-o>` Open the selected commit in the browser
 - `<C-y>` copy the commit hash to clipboard
+- `<C-w>` toggle date and author in entry
 
 ### 4. diff_commit_line -- Diff current file with selected line history
 
@@ -79,6 +82,7 @@ _Grep behaviour_: filter on commit message.
 - `<C-e>` show the entire commit for all files in neovim with diff plugin
 - `<C-o>` opens a the selected commit in the browser
 - `<C-y>` copy the commit hash to clipboard
+- `<C-w>` toggle date and author in entry
 
 ### 5. diff_branch_file -- Diff file with branch
 

lua/advanced_git_search/fzf/mappings/init.lua

@@ -5,6 +5,19 @@ local global_actions = require("advanced_git_search.actions")
 local file_utils = require("advanced_git_search.utils.file")
 local git_utils = require("advanced_git_search.utils.git")
 
+---FZF: <C-w> Toggle date or author in picker entry
+---@return table
+M.toggle_entry_value = function()
+    return {
+        ["ctrl-w"] = {
+            fn = function(_, _)
+                require("advanced_git_search.fzf.pickers.utils").toggle_show_date_instead_of_author()
+            end,
+            reload = true,
+        },
+    }
+end
+
 ---FZF: <C-o> Opens the selected commit in browser
 ---@return table
 M.open_commit_in_brower = function()

lua/advanced_git_search/fzf/pickers/init.lua

@@ -23,7 +23,8 @@ M.search_log_content = function()
             fzf_mappings.open_commit_in_brower(),
             fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
             fzf_mappings.show_entire_commit(),
-            fzf_mappings.copy_commit_hash()
+            fzf_mappings.copy_commit_hash(),
+            fzf_mappings.toggle_entry_value()
         ),
     }
 
@@ -37,7 +38,7 @@ M.search_log_content_file = function()
 
     local opts = {
         prompt = "Log> ",
-        exec_empty_query = false,
+        exec_empty_query = true,
         func_async_callback = false,
         fzf_opts = {
             ["--preview"] = fzf_previewers.git_diff_content_previewer(),
@@ -50,7 +51,8 @@ M.search_log_content_file = function()
             fzf_mappings.open_commit_in_brower(),
             fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
             fzf_mappings.show_entire_commit(),
-            fzf_mappings.copy_commit_hash()
+            fzf_mappings.copy_commit_hash(),
+            fzf_mappings.toggle_entry_value()
         ),
     }
 
@@ -88,7 +90,8 @@ M.diff_commit_line = function()
             fzf_mappings.open_commit_in_brower(),
             fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
             fzf_mappings.show_entire_commit(),
-            fzf_mappings.copy_commit_hash()
+            fzf_mappings.copy_commit_hash(),
+            fzf_mappings.toggle_entry_value()
         ),
     }
 
@@ -115,7 +118,8 @@ M.diff_commit_file = function()
             fzf_mappings.open_commit_in_brower(),
             fzf_mappings.open_diff_buffer_with_selected_commit(bufnr),
             fzf_mappings.show_entire_commit(),
-            fzf_mappings.copy_commit_hash()
+            fzf_mappings.copy_commit_hash(),
+            fzf_mappings.toggle_entry_value()
         ),
     }
 

lua/advanced_git_search/fzf/pickers/utils.lua

@@ -2,6 +2,10 @@ local color = require("fzf-lua").utils.ansi_codes
 local utils = require("advanced_git_search.utils")
 
 local M = {}
+local show_date_instead_of_author = false
+M.toggle_show_date_instead_of_author = function()
+    show_date_instead_of_author = not show_date_instead_of_author
+end
 
 M.make_entry = function(entry)
     if entry == "" or entry == nil then
@@ -13,7 +17,7 @@ M.make_entry = function(entry)
     local split = utils.split_string(cleaned, "_")
     local attrs = utils.split_string(split[1])
     local hash = attrs[1]
-    -- local date = attrs[2]
+    local date = attrs[2]
     local author = ""
     for i = 3, #attrs do
         author = author .. attrs[i] .. " "
@@ -27,9 +31,17 @@ M.make_entry = function(entry)
     end
 
     -- NOTE: make sure the first value is the commit hash
-    return color.magenta(hash)
-        .. color.cyan(" @" .. author)
-        .. color.yellow(message)
+    local final_entry = ""
+    if show_date_instead_of_author then
+        final_entry = color.magenta(hash)
+            .. color.cyan(" " .. date)
+            .. color.yellow(message)
+    else
+        final_entry = color.magenta(hash)
+            .. color.cyan(" @" .. author)
+            .. color.yellow(message)
+    end
+    return final_entry
 end
 
 M.make_reflog_entry = function(entry)

lua/advanced_git_search/telescope/finders/utils.lua

@@ -1,9 +1,15 @@
 local utils = require("advanced_git_search.utils")
 local entry_display = require("telescope.pickers.entry_display")
 
+local show_date_instead_of_author = false
+
 local M = {}
 local last_prompt = nil
 
+M.toggle_show_date_instead_of_author = function()
+    show_date_instead_of_author = not show_date_instead_of_author
+end
+
 --- Parse "--format=%C(auto)%h %as %C(green)%an _ %Creset %s" to table
 --- with opts: commit_hash, date, author, message, prompt
 --- @param entry string
@@ -13,7 +19,7 @@ M.git_log_entry_maker = function(entry)
     local cleaned = string.gsub(entry, "'", "")
     local split = utils.split_string(cleaned, "_")
     local attrs = utils.split_string(split[1])
-    local hash = attrs[1]
+    local hash = string.sub(attrs[1], 1, 7)
     local date = attrs[2]
     local author = attrs[3]
     for i = 4, #attrs do
@@ -28,21 +34,42 @@ M.git_log_entry_maker = function(entry)
         end
     end
 
+    local second_width = 10
+    if show_date_instead_of_author then
+        second_width = 10
+    else
+        second_width = #author
+    end
+
     local displayer = entry_display.create({
         separator = " ",
         items = {
             { width = 7 },
-            { width = 7 },
+            { width = second_width },
             { remaining = true },
         },
     })
 
     local make_display = function(display_entry)
-        return displayer({
-            { display_entry.opts.commit_hash, "TelescopeResultsIdentifier" },
-            { display_entry.opts.author, "TelescopeResultsVariable" },
-            { display_entry.opts.message, "TelescopeResultsConstant" },
-        })
+        if show_date_instead_of_author then
+            return displayer({
+                {
+                    display_entry.opts.commit_hash,
+                    "TelescopeResultsIdentifier",
+                },
+                { display_entry.opts.date, "TelescopeResultsVariable" },
+                { display_entry.opts.message, "TelescopeResultsConstant" },
+            })
+        else
+            return displayer({
+                {
+                    display_entry.opts.commit_hash,
+                    "TelescopeResultsIdentifier",
+                },
+                { display_entry.opts.author, "TelescopeResultsVariable" },
+                { display_entry.opts.message, "TelescopeResultsConstant" },
+            })
+        end
     end
 
     return {

lua/advanced_git_search/telescope/mappings/init.lua

@@ -18,6 +18,17 @@ M.omnimap = omnimap
 
 -- create a local function and assign it to a map to get which_key description
 -------------------------------------------------------------------------------
+local toggle_date_author = function(prompt_bufnr)
+    require("advanced_git_search.telescope.finders.utils").toggle_show_date_instead_of_author()
+    action_state.get_current_picker(prompt_bufnr):refresh()
+end
+
+M.toggle_entry_value = function(map)
+    omnimap(map, "<C-w>", toggle_date_author)
+end
+
+-------------------------------------------------------------------------------
+
 local open_commit_in_browser = function(prompt_bufnr)
     actions.close(prompt_bufnr)
     local selection = action_state.get_selected_entry()

lua/advanced_git_search/telescope/pickers/init.lua

@@ -101,6 +101,7 @@ M.diff_commit_line = function()
                 telescope_ags_mappings.open_selected_commit_in_browser(map)
                 telescope_ags_mappings.copy_commit_hash_to_clipboard(map)
                 telescope_ags_mappings.show_entire_commit(map)
+                telescope_ags_mappings.toggle_entry_value(map)
                 return true
             end,
         }, theme_opts))
@@ -128,6 +129,7 @@ M.search_log_content = function()
                 telescope_ags_mappings.open_selected_commit_in_browser(map)
                 telescope_ags_mappings.copy_commit_hash_to_clipboard(map)
                 telescope_ags_mappings.show_entire_commit(map)
+                telescope_ags_mappings.toggle_entry_value(map)
                 return true
             end,
         }, theme_opts))
@@ -158,6 +160,7 @@ M.search_log_content_file = function()
                 telescope_ags_mappings.open_selected_commit_in_browser(map)
                 telescope_ags_mappings.copy_commit_hash_to_clipboard(map)
                 telescope_ags_mappings.show_entire_commit(map)
+                telescope_ags_mappings.toggle_entry_value(map)
 
                 return true
             end,
@@ -185,6 +188,7 @@ M.diff_commit_file = function()
                     map
                 )
                 telescope_ags_mappings.show_entire_commit(map)
+                telescope_ags_mappings.toggle_entry_value(map)
                 telescope_ags_mappings.open_selected_commit_in_browser(map)
                 telescope_ags_mappings.copy_commit_hash_to_clipboard(map)