refactor: shortening of relative dates

Author: chrisgrieser

lua/tinygit/commands/commit.lua

@@ -186,7 +186,7 @@ function M.fixupCommit(opts)
 	local result = vim.system({
 		"git",
 		"log",
-		"-n" .. tostring(opts.selectFromLastXCommits),
+		"--max-count=" .. opts.selectFromLastXCommits,
 		"--format=" .. gitlogFormat,
 	}):wait()
 	if u.nonZeroExit(result) then return end
@@ -196,16 +196,17 @@ function M.fixupCommit(opts)
 	local icon = require("tinygit.config").config.appearance.mainIcon
 	local prompt = vim.trim(icon .. " Select commit to fixup")
 	local commitFormatter = function(commitLine)
-		local _, subject, date, nameAtCommit = unpack(vim.split(commitLine, "\t"))
-		local displayLine = ("%s\t%s"):format(subject, date)
+		local _, subject, relDate, nameAtCommit = unpack(vim.split(commitLine, "\t"))
+		local shortRelDate = u.shortenRelativeDate(relDate)
+		local displayLine = ("%s\t%s"):format(subject, shortRelDate)
 		-- append name at commit, if it exists
 		if nameAtCommit then displayLine = displayLine .. ("\t(%s)"):format(nameAtCommit) end
 		return displayLine
 	end
 	local stylingFunc = function()
-		local hl = require("tinygit.shared.highlights")
-		hl.commitType()
-		hl.inlineCodeAndIssueNumbers()
+		local highlights = require("tinygit.shared.highlights")
+		highlights.commitType()
+		highlights.inlineCodeAndIssueNumbers()
 		vim.fn.matchadd("Comment", [[\t.*$]])
 	end
 	local onChoice = function(commit)

lua/tinygit/commands/commit/preview.lua

@@ -57,20 +57,13 @@ end
 ---@return string[] logLines
 function M.getGitLog()
 	local loglines = require("tinygit.config").config.commit.preview.loglines
-	local args = { "git", "log", "--max-count=" .. loglines, "--format=%s  %cr" }
+	local args = { "git", "log", "--max-count=" .. loglines, "--format=%s  %cr" } -- subject, date
 	local lines = vim.split(u.syncShellCmd(args), "\n")
 
-	-- shorten units, like `minutes` to `min`
-	lines = vim.tbl_map(function(line)
-		local shortLine = line:gsub(" (%a+) ago$", function(unit)
-			local shortUnit = (unit:match("%ai?n?") or "") -- 1 unit char (expect min)
-				:gsub("m$", "mo") -- "month" -> "mo" to be distinguishable from "min"
-			return shortUnit .. " ago"
-		end)
-		return shortLine
-	end, lines)
-
-	return lines
+	return vim.tbl_map(
+		function(line) return line:gsub("%d+ %a+ ago$", u.shortenRelativeDate) end,
+		lines
+	)
 end
 
 ---@param bufnr number

lua/tinygit/shared/utils.lua

@@ -60,5 +60,16 @@ function M.intentToAddUntrackedFiles()
 	end
 end
 
+---@param longStr string
+---@return string shortened
+function M.shortenRelativeDate(longStr)
+	local shortStr = (longStr:match("%d+ %ai?n?") or "") -- 1 unit char (expect min)
+		:gsub("m$", "mo") -- "month" -> "mo" to keep it distinguishable from "min"
+		:gsub(" ", "")
+		:gsub("%d+s$", "just now") -- secs -> just now
+	if shortStr ~= "just now" then shortStr = shortStr .. " ago" end
+	return shortStr
+end
+
 --------------------------------------------------------------------------------
 return M

lua/tinygit/statusline/blame.lua

@@ -24,20 +24,14 @@ local function getBlame(bufnr)
 
 	local hash, author, relDate, msg = unpack(vim.split(stdout, "\t"))
 	if vim.tbl_contains(config.ignoreAuthors, author) then return "" end
+	local shortRelDate = u.shortenRelativeDate(relDate)
 
 	-- GUARD shallow and on first commit
 	-- get first commit: https://stackoverflow.com/a/5189296/22114136
 	local isOnFirstCommit = hash == u.syncShellCmd { "git", "rev-list", "--max-parents=0", "HEAD" }
 	local shallowRepo = require("tinygit.shared.utils").inShallowRepo()
 	if shallowRepo and isOnFirstCommit then return "" end
 
-	-- shorten the output
-	local shortRelDate = (relDate:match("%d+ %wi?n?") or "") -- 1 unit char (expect min)
-		:gsub("m$", "mo") -- "month" -> "mo" to be distinguishable from "min"
-		:gsub(" ", "")
-		:gsub("%d+s", "just now") -- secs -> just now
-	if not shortRelDate:find("just now") then shortRelDate = shortRelDate .. " ago" end
-
 	if vim.list_contains(config.showOnlyTimeIfAuthor, author) then
 		return vim.trim(("%s %s"):format(config.icon, shortRelDate))
 	end