* add todo * refactor(#2886): multi instance: node class refactoring: extract links, *_git_status (#2944) * extract DirectoryLinkNode and FileLinkNode, move Node methods to children * temporarily move DirectoryNode methods into BaseNode for easier reviewing * move mostly unchanged DirectoryNode methods back to BaseNode * tidy * git.git_status_file takes an array * update git status of links * luacheck hack * safer git_status_dir * refactor(#2886): multi instance: node class refactoring: DirectoryNode:expand_or_collapse (#2957) move expand_or_collapse to DirectoryNode * refactor(#2886): multi instance: node group functions refactoring (#2959) * move last_group_node to DirectoryNode * move add BaseNode:as and more doc * revert parameter name changes * revert parameter name changes * add Class * move group methods into DN * tidy group methods * tidy group methods * tidy group methods * tidy group methods * parent is DirectoryNode * tidy expand all * BaseNode -> Node * move watcher to DirectoryNode * last_group_node is DirectoryNode only * simplify create-file * simplify parent * simplify collapse-all * simplify live-filter * style * move lib.get_cursor_position to Explorer * move lib.get_node_at_cursor to Explorer * move lib.get_nodes to Explorer * move place_cursor_on_node to Explorer * resolve resource leak in purge_all_state * move many autocommands into Explorer * post merge tidy * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * Revert "chore: resolve undefined-field" This reverts commit be546ff18d41f28466b065c857e1e041659bd2c8. * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * Revert "chore: resolve undefined-field" This reverts commite82db1c44d. * chore: resolve undefined-field * chore: class new is now generic * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * Revert "chore: resolve undefined-field" This reverts commit0e9b844d22. * move icon builders into node classes * move icon builders into node classes * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * chore: resolve undefined-field * move folder specifics from icons to Directory * move folder specifics from icons to Directory * move folder specifics from icons to Directory * move folder specifics from icons to Directory * move file specifics from icons to File * clean up sorters * chore: resolve undefined-field * tidy hl icon name * file devicon uses library to fall back * file devicon uses library to fall back * file devicon uses library to fall back
257 lines
6.3 KiB
Lua
257 lines
6.3 KiB
Lua
local log = require("nvim-tree.log")
|
|
local utils = require("nvim-tree.utils")
|
|
local notify = require("nvim-tree.notify")
|
|
|
|
local Class = require("nvim-tree.class")
|
|
|
|
---@class (exact) GitRunnerOpts
|
|
---@field toplevel string absolute path
|
|
---@field path string? absolute path
|
|
---@field list_untracked boolean
|
|
---@field list_ignored boolean
|
|
---@field timeout integer
|
|
---@field callback fun(path_xy: GitPathXY)?
|
|
|
|
---@class (exact) GitRunner: Class
|
|
---@field private opts GitRunnerOpts
|
|
---@field private path_xy GitPathXY
|
|
---@field private rc integer? -- -1 indicates timeout
|
|
local GitRunner = Class:new()
|
|
|
|
local timeouts = 0
|
|
local MAX_TIMEOUTS = 5
|
|
|
|
---@private
|
|
---@param status string
|
|
---@param path string|nil
|
|
function GitRunner:parse_status_output(status, path)
|
|
if not path then
|
|
return
|
|
end
|
|
|
|
-- replacing slashes if on windows
|
|
if vim.fn.has("win32") == 1 then
|
|
path = path:gsub("/", "\\")
|
|
end
|
|
if #status > 0 and #path > 0 then
|
|
self.path_xy[utils.path_remove_trailing(utils.path_join({ self.opts.toplevel, path }))] = status
|
|
end
|
|
end
|
|
|
|
---@private
|
|
---@param prev_output string
|
|
---@param incoming string
|
|
---@return string
|
|
function GitRunner:handle_incoming_data(prev_output, incoming)
|
|
if incoming and utils.str_find(incoming, "\n") then
|
|
local prev = prev_output .. incoming
|
|
local i = 1
|
|
local skip_next_line = false
|
|
for line in prev:gmatch("[^\n]*\n") do
|
|
if skip_next_line then
|
|
skip_next_line = false
|
|
else
|
|
local status = line:sub(1, 2)
|
|
local path = line:sub(4, -2)
|
|
if utils.str_find(status, "R") then
|
|
-- skip next line if it is a rename entry
|
|
skip_next_line = true
|
|
end
|
|
self:parse_status_output(status, path)
|
|
end
|
|
i = i + #line
|
|
end
|
|
|
|
return prev:sub(i, -1)
|
|
end
|
|
|
|
if incoming then
|
|
return prev_output .. incoming
|
|
end
|
|
|
|
for line in prev_output:gmatch("[^\n]*\n") do
|
|
self:parse_status_output(line)
|
|
end
|
|
|
|
return ""
|
|
end
|
|
|
|
---@private
|
|
---@param stdout_handle uv.uv_pipe_t
|
|
---@param stderr_handle uv.uv_pipe_t
|
|
---@return uv.spawn.options
|
|
function GitRunner:get_spawn_options(stdout_handle, stderr_handle)
|
|
local untracked = self.opts.list_untracked and "-u" or nil
|
|
local ignored = (self.opts.list_untracked and self.opts.list_ignored) and "--ignored=matching" or "--ignored=no"
|
|
return {
|
|
args = { "--no-optional-locks", "status", "--porcelain=v1", "-z", ignored, untracked, self.opts.path },
|
|
cwd = self.opts.toplevel,
|
|
stdio = { nil, stdout_handle, stderr_handle },
|
|
}
|
|
end
|
|
|
|
---@private
|
|
---@param output string
|
|
function GitRunner:log_raw_output(output)
|
|
if log.enabled("git") and output and type(output) == "string" then
|
|
log.raw("git", "%s", output)
|
|
log.line("git", "done")
|
|
end
|
|
end
|
|
|
|
---@private
|
|
---@param callback function|nil
|
|
function GitRunner:run_git_job(callback)
|
|
local handle, pid
|
|
local stdout = vim.loop.new_pipe(false)
|
|
local stderr = vim.loop.new_pipe(false)
|
|
local timer = vim.loop.new_timer()
|
|
|
|
if stdout == nil or stderr == nil or timer == nil then
|
|
return
|
|
end
|
|
|
|
local function on_finish(rc)
|
|
self.rc = rc or 0
|
|
if timer:is_closing() or stdout:is_closing() or stderr:is_closing() or (handle and handle:is_closing()) then
|
|
if callback then
|
|
callback()
|
|
end
|
|
return
|
|
end
|
|
timer:stop()
|
|
timer:close()
|
|
stdout:read_stop()
|
|
stderr:read_stop()
|
|
stdout:close()
|
|
stderr:close()
|
|
|
|
-- don't close the handle when killing as it will leave a zombie
|
|
if rc == -1 then
|
|
pcall(vim.loop.kill, pid, "sigkill")
|
|
elseif handle then
|
|
handle:close()
|
|
end
|
|
|
|
if callback then
|
|
callback()
|
|
end
|
|
end
|
|
|
|
local spawn_options = self:get_spawn_options(stdout, stderr)
|
|
log.line("git", "running job with timeout %dms", self.opts.timeout)
|
|
log.line("git", "git %s", table.concat(utils.array_remove_nils(spawn_options.args), " "))
|
|
|
|
handle, pid = vim.loop.spawn(
|
|
"git",
|
|
spawn_options,
|
|
vim.schedule_wrap(function(rc)
|
|
on_finish(rc)
|
|
end)
|
|
)
|
|
|
|
timer:start(
|
|
self.opts.timeout,
|
|
0,
|
|
vim.schedule_wrap(function()
|
|
on_finish(-1)
|
|
end)
|
|
)
|
|
|
|
local output_leftover = ""
|
|
local function manage_stdout(err, data)
|
|
if err then
|
|
return
|
|
end
|
|
if data then
|
|
data = data:gsub("%z", "\n")
|
|
end
|
|
self:log_raw_output(data)
|
|
output_leftover = self:handle_incoming_data(output_leftover, data)
|
|
end
|
|
|
|
local function manage_stderr(_, data)
|
|
self:log_raw_output(data)
|
|
end
|
|
|
|
vim.loop.read_start(stdout, vim.schedule_wrap(manage_stdout))
|
|
vim.loop.read_start(stderr, vim.schedule_wrap(manage_stderr))
|
|
end
|
|
|
|
---@private
|
|
function GitRunner:wait()
|
|
local function is_done()
|
|
return self.rc ~= nil
|
|
end
|
|
|
|
while not vim.wait(30, is_done) do
|
|
end
|
|
end
|
|
|
|
---@private
|
|
function GitRunner:finalise()
|
|
if self.rc == -1 then
|
|
log.line("git", "job timed out %s %s", self.opts.toplevel, self.opts.path)
|
|
timeouts = timeouts + 1
|
|
if timeouts == MAX_TIMEOUTS then
|
|
notify.warn(string.format("%d git jobs have timed out after git.timeout %dms, disabling git integration.", timeouts,
|
|
self.opts.timeout))
|
|
require("nvim-tree.git").disable_git_integration()
|
|
end
|
|
elseif self.rc ~= 0 then
|
|
log.line("git", "job fail rc %d %s %s", self.rc, self.opts.toplevel, self.opts.path)
|
|
else
|
|
log.line("git", "job success %s %s", self.opts.toplevel, self.opts.path)
|
|
end
|
|
end
|
|
|
|
---Return nil when callback present
|
|
---@private
|
|
---@return GitPathXY?
|
|
function GitRunner:execute()
|
|
local async = self.opts.callback ~= nil
|
|
local profile = log.profile_start("git %s job %s %s", async and "async" or "sync", self.opts.toplevel, self.opts.path)
|
|
|
|
if async and self.opts.callback then
|
|
-- async, always call back
|
|
self:run_git_job(function()
|
|
log.profile_end(profile)
|
|
|
|
self:finalise()
|
|
|
|
self.opts.callback(self.path_xy)
|
|
end)
|
|
else
|
|
-- sync, maybe call back
|
|
self:run_git_job()
|
|
self:wait()
|
|
|
|
log.profile_end(profile)
|
|
|
|
self:finalise()
|
|
|
|
if self.opts.callback then
|
|
self.opts.callback(self.path_xy)
|
|
else
|
|
return self.path_xy
|
|
end
|
|
end
|
|
end
|
|
|
|
---Static method to run a git process, which will be killed if it takes more than timeout
|
|
---Return nil when callback present
|
|
---@param opts GitRunnerOpts
|
|
---@return GitPathXY?
|
|
function GitRunner:run(opts)
|
|
---@type GitRunner
|
|
local runner = {
|
|
opts = opts,
|
|
path_xy = {},
|
|
}
|
|
runner = GitRunner:new(runner)
|
|
|
|
return runner:execute()
|
|
end
|
|
|
|
return GitRunner
|