feat(file-history): Show ref-names in the history panel. (fixes #195)

Author: sindrets

lua/diffview/git/commit.lua

@@ -16,6 +16,7 @@ local M = {}
 ---@field time_offset number
 ---@field date string
 ---@field rel_date string
+---@field ref_names string
 ---@field subject string
 ---@field body string
 local Commit = oop.create_class("Commit")
@@ -25,6 +26,7 @@ function Commit:init(opt)
   self.author = opt.author
   self.time = opt.time
   self.rel_date = opt.rel_date
+  self.ref_names = opt.ref_names ~= "" and opt.ref_names or nil
   self.subject = opt.subject
   self.body = opt.body
 

lua/diffview/git/utils.lua

@@ -589,8 +589,9 @@ local function structure_fh_data(namestat_data, numstat_data)
     time = tonumber(time),
     time_offset = time_offset,
     rel_date = namestat_data[4],
-    subject = namestat_data[5]:sub(3),
-    namestat = utils.vec_slice(namestat_data, 6),
+    ref_names = namestat_data[5]:sub(3),
+    subject = namestat_data[6]:sub(3),
+    namestat = utils.vec_slice(namestat_data, 7),
     numstat = numstat_data,
   }
 end
@@ -663,7 +664,7 @@ local incremental_fh_data = async.void(function(state, callback)
       git_args(),
       "log",
       rev_range,
-      "--pretty=format:%x00%n%H %P%n%an%n%ad%n%ar%n  %s",
+      "--pretty=format:%x00%n%H %P%n%an%n%ad%n%ar%n  %D%n  %s",
       "--date=raw",
       "--name-status",
       state.prepared_log_opts.flags,
@@ -781,7 +782,7 @@ local incremental_line_trace_data = async.void(function(state, callback)
       rev_range,
       "--color=never",
       "--no-ext-diff",
-      "--pretty=format:%x00%n%H %P%n%an%n%ad%n%ar%n  %s",
+      "--pretty=format:%x00%n%H %P%n%an%n%ad%n%ar%n  %D%n  %s",
       "--date=raw",
       state.prepared_log_opts.flags,
       "--"
@@ -1112,6 +1113,7 @@ local function file_history_worker(thread, ctx, log_opt, opt, co_state, callback
       time = tonumber(state.cur.time),
       time_offset = state.cur.time_offset,
       rel_date = state.cur.rel_date,
+      ref_names = state.cur.ref_names,
       subject = state.cur.subject,
     })
 

lua/diffview/hl.lua

@@ -411,6 +411,7 @@ M.hl_links = {
   FilePanelConflicts = "DiagnosticSignWarn",
   FolderName = "Directory",
   FolderSign = "PreProc",
+  Reference = "Function",
   StatusAdded = "diffAdded",
   StatusUntracked = "diffAdded",
   StatusModified = "diffChanged",

lua/diffview/scene/views/file_history/render.lua

@@ -151,6 +151,13 @@ local function render_entries(parent, entries, updating)
       s = s .. hash .. " "
     end
 
+    offset = #s
+    if entry.commit.ref_names then
+      local ref_names = ("(%s) "):format(entry.commit.ref_names)
+      comp:add_hl("DiffviewReference", line_idx, offset, offset + #ref_names)
+      s = s .. ref_names
+    end
+
     offset = #s
     local subject = utils.str_shorten(entry.commit.subject, 72)
     if subject == "" then