mirrors/snacks.nvim
1
0
Fork 0
mirror of https://github.com/folke/snacks.nvim synced 2025-08-04 18:58:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix(picker.git): properly handle file renames for git log. Closes #1154

Browse source
This commit is contained in:
Folke Lemaitre 2025-02-15 08:06:01 +01:00
parent ec94b9735a
commit 9c436cb273
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
2 changed files with 50 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

68
lua/snacks/picker/source/git.lua
View file

@ -89,9 +89,6 @@ function M.log(opts, ctx)
"--no-show-signature",
"--no-patch",
}
if opts.follow and not opts.current_file then
opts.follow = nil
end
local file ---@type string?
if opts.current_line then
@ -109,27 +106,54 @@ function M.log(opts, ctx)
args[#args + 1] = file
end
local Proc = require("snacks.picker.source.proc")
file = file and vim.fs.normalize(file) or nil
local cwd = vim.fs.normalize(file and vim.fn.fnamemodify(file, ":h") or opts and opts.cwd or uv.cwd() or ".") or nil
return require("snacks.picker.source.proc").proc({
opts,
{
cwd = cwd,
cmd = "git",
args = args,
---@param item snacks.picker.finder.Item
transform = function(item)
local commit, msg, date = item.text:match("^(%S+) (.*) %((.*)%)$")
if not commit then
error(item.text)
local renames = { file } ---@type string[]
return function(cb)
if file then
-- detect renames
local is_rename = false
Proc.proc({
cmd = "git",
cwd = cwd,
args = { "log", "-z", "--follow", "--name-status", "--pretty=format:''", "--diff-filter=R", "--", file },
}, ctx)(function(item)
for _, text in ipairs(vim.split(item.text, "\0")) do
if text:find("^R%d%d%d$") then
is_rename = true
elseif is_rename then
is_rename = false
renames[#renames + 1] = text
end
end
item.cwd = cwd
item.commit = commit
item.msg = msg
item.date = date
item.file = file
end,
},
}, ctx)
end)
end
Proc.proc({
opts,
{
cwd = cwd,
cmd = "git",
args = args,
---@param item snacks.picker.finder.Item
transform = function(item)
local commit, msg, date = item.text:match("^(%S+) (.*) %((.*)%)$")
if not commit then
Snacks.notify.error(("failed to parse log item:\n%q"):format(item.text))
return false
end
item.cwd = cwd
item.commit = commit
item.msg = msg
item.date = date
item.file = file
item.files = renames
end,
},
}, ctx)(cb)
end
end
---@param opts snacks.picker.git.status.Config